From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13

---
 src/main/java/com/zy/asrs/entity/TrayCode.java |   51 ++++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 25 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..f084b98 100644
--- a/src/main/java/com/zy/asrs/entity/TrayCode.java
+++ b/src/main/java/com/zy/asrs/entity/TrayCode.java
@@ -22,69 +22,70 @@
     /**
      * 缂栧彿
      */
-    @ApiModelProperty(value= "缂栧彿")
+    @ApiModelProperty(value = "缂栧彿")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 搴忓垪鍙�
      */
-    @ApiModelProperty(value= "搴忓垪鍙�")
+    @ApiModelProperty(value = "搴忓垪鍙�")
     @TableField("tray_no")
     private String trayNo;
 
     /**
      * 璧峰
      */
-    @ApiModelProperty(value= "璧峰")
+    @ApiModelProperty(value = "璧峰")
     private String start;
 
     /**
      * 缁堟
      */
-    @ApiModelProperty(value= "缁堟")
-    private String end;
+    @ApiModelProperty(value = "缁堟")
+    private String finish;
 
     /**
      * 澶囨敞
      */
-    @ApiModelProperty(value= "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
     private String memo;
 
     /**
      * 淇敼鏃堕棿
      */
-    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @ApiModelProperty(value = "淇敼鏃堕棿")
     @TableField("modi_time")
     private Date modiTime;
 
     /**
      * 淇敼浜哄憳
      */
-    @ApiModelProperty(value= "淇敼浜哄憳")
+    @ApiModelProperty(value = "淇敼浜哄憳")
     @TableField("modi_user")
     private Long modiUser;
 
     /**
      * 娣诲姞鏃堕棿
      */
-    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
     @TableField("appe_time")
     private Date appeTime;
 
     /**
      * 娣诲姞浜哄憳
      */
-    @ApiModelProperty(value= "娣诲姞浜哄憳")
+    @ApiModelProperty(value = "娣诲姞浜哄憳")
     @TableField("appe_user")
     private Long appeUser;
 
-    public TrayCode() {}
+    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 +128,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() {
@@ -147,8 +148,8 @@
         return modiTime;
     }
 
-    public String getModiTime$(){
-        if (Cools.isEmpty(this.modiTime)){
+    public String getModiTime$() {
+        if (Cools.isEmpty(this.modiTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -162,10 +163,10 @@
         return modiUser;
     }
 
-    public String getModiUser$(){
+    public String getModiUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.modiUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getUsername());
         }
         return null;
@@ -179,8 +180,8 @@
         return appeTime;
     }
 
-    public String getAppeTime$(){
-        if (Cools.isEmpty(this.appeTime)){
+    public String getAppeTime$() {
+        if (Cools.isEmpty(this.appeTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
@@ -194,10 +195,10 @@
         return appeUser;
     }
 
-    public String getAppeUser$(){
+    public String getAppeUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.appeUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getUsername());
         }
         return null;

--
Gitblit v1.9.1