From d3cb0e841e6585aa84a45f18bb30965db8d1a6aa Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 15:48:40 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 2d0e335..e5a02fa 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -48,7 +51,8 @@
     @ApiModelProperty(value= "棰滆壊")
     private String color;
 
-    @ApiModelProperty(value= "鍝佺墝")
+    @ApiModelProperty(value= "绫诲瀷")
+//    @ApiModelProperty(value= "鍝佺墝")
     private String brand;
 
     @ApiModelProperty(value= "鍗曚綅")
@@ -148,8 +152,15 @@
     @TableField("appe_user")
     private Long appeUser;
 
+    @TableField(exist = false)
+    private String appeUser$;
+
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
+
+    @ApiModelProperty(value= "bom鍙�")
+    @TableField("bom_code")
+    private String bomCode;
 
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
@@ -215,4 +226,12 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public String getAppeUser$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.appeUser);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getUsername());
+        }
+        return null;
+    }
 }

--
Gitblit v1.9.1