From b0f1c7464b31e70e227e01ae7d36e20262215ace Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 11 八月 2023 15:24:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhtasrs' into tzhtasrs

---
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java |    3 +++
 1 files changed, 3 insertions(+), 0 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..a4947ff 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;
 

--
Gitblit v1.9.1