From 298285bf63c0cec97fab0c64df4c010c5d2aebe6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 31 五月 2023 12:47:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test

---
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 15a23ed..a4947ff 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -55,7 +55,7 @@
 	@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
 	private String maktx;
 
-	@ApiModelProperty(value= "搴忓垪鐮�")
+	@ApiModelProperty(value= "鎵瑰彿")
 	private String batch;
 
 	@ApiModelProperty(value= "鍗曟嵁缂栧彿")

--
Gitblit v1.9.1