From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 27 五月 2022 15:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs

---
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java |    5 ++++-
 1 files changed, 4 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 4ce76d7..15a23ed 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -31,6 +31,9 @@
 
 	private Integer row;
 
+	private String crn_str_time;
+	private String crn_end_time;
+
 	@ApiModelProperty(value= "宸ヤ綔鍙�")
 	private Integer wrk_no;
 
@@ -52,7 +55,7 @@
 	@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
 	private String maktx;
 
-	@ApiModelProperty(value= "鎵瑰彿")
+	@ApiModelProperty(value= "搴忓垪鐮�")
 	private String batch;
 
 	@ApiModelProperty(value= "鍗曟嵁缂栧彿")

--
Gitblit v1.9.1