From 7ad79ee463adbdbc51e37c12ae025fb8598ab670 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 14:25:36 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 39011f1..4df9222 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -7,6 +7,8 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.LocOwnerService;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -162,9 +164,9 @@
     private Integer owner;
 
     /**
-     * 鏄惁浠樻
+     * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
      */
-    @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻   ")
+    @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
     private Integer payment;
 
     /**
@@ -188,9 +190,9 @@
         if (null == this.payment){ return null; }
         switch (this.payment){
             case 1:
-                return "宸蹭粯娆�";
+                return "浠撳偍";
             case 0:
-                return "鏈粯娆�";
+                return "浠i噰";
             default:
                 return String.valueOf(this.payment);
         }
@@ -260,4 +262,13 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public String getCreateBy$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.modiUser);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getUsername());
+        }
+        return null;
+    }
+
 }

--
Gitblit v1.9.1