From 43bf799fc85e18923480b5877e01b46dab28606f Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期六, 13 八月 2022 16:19:20 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/entity/TrayCode.java b/src/main/java/com/zy/asrs/entity/TrayCode.java
index de749c2..cbb30ba 100644
--- a/src/main/java/com/zy/asrs/entity/TrayCode.java
+++ b/src/main/java/com/zy/asrs/entity/TrayCode.java
@@ -6,8 +6,8 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -43,7 +43,7 @@
      * 缁堟
      */
     @ApiModelProperty(value= "缁堟")
-    private String end;
+    private String finish;
 
     /**
      * 澶囨敞
@@ -81,10 +81,10 @@
 
     public TrayCode() {}
 
-    public TrayCode(String trayNo,String start,String end,String memo,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
+    public TrayCode(String trayNo,String start,String finish,String memo,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
         this.trayNo = trayNo;
         this.start = start;
-        this.end = end;
+        this.finish = finish;
         this.memo = memo;
         this.modiTime = modiTime;
         this.modiUser = modiUser;
@@ -127,12 +127,12 @@
         this.start = start;
     }
 
-    public String getEnd() {
-        return end;
+    public String getFinish() {
+        return finish;
     }
 
-    public void setEnd(String end) {
-        this.end = end;
+    public void setFinish(String finish) {
+        this.finish = finish;
     }
 
     public String getMemo() {

--
Gitblit v1.9.1