From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs

---
 src/main/java/com/zy/asrs/entity/BasCrnError.java |   66 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasCrnError.java b/src/main/java/com/zy/asrs/entity/BasCrnError.java
index 8702140..a3e9034 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -3,7 +3,6 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.system.entity.User;
@@ -22,47 +21,48 @@
     /**
      * 寮傚父浠ｅ彿
      */
-    @ApiModelProperty(value= "寮傚父浠ｅ彿")
-    @TableId(value = "error_code", type = IdType.AUTO)
+    @ApiModelProperty(value = "寮傚父浠ｅ彿")
+    @TableId(value = "error_code")
     @TableField("error_code")
     private Long errorCode;
 
     /**
      * 寮傚父鎻忚堪
      */
-    @ApiModelProperty(value= "寮傚父鎻忚堪")
+    @ApiModelProperty(value = "寮傚父鎻忚堪")
     @TableField("err_name")
     private String errName;
 
     /**
      * 淇敼浜哄憳
      */
-    @ApiModelProperty(value= "淇敼浜哄憳")
+    @ApiModelProperty(value = "淇敼浜哄憳")
     @TableField("modi_user")
     private Long modiUser;
 
     /**
      * 淇敼鏃堕棿
      */
-    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @ApiModelProperty(value = "淇敼鏃堕棿")
     @TableField("modi_time")
     private Date modiTime;
 
     /**
      * 鍒涘缓鑰�
      */
-    @ApiModelProperty(value= "鍒涘缓鑰�")
+    @ApiModelProperty(value = "鍒涘缓鑰�")
     @TableField("appe_user")
     private Long appeUser;
 
     /**
      * 娣诲姞鏃堕棿
      */
-    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
     @TableField("appe_time")
     private Date appeTime;
 
-    public BasCrnError() {}
+    public BasCrnError() {
+    }
 
     public BasCrnError(String errName, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
         this.errName = errName;
@@ -100,64 +100,64 @@
         return modiUser;
     }
 
-    public String getModiUser$(){
+    public void setModiUser(Long modiUser) {
+        this.modiUser = modiUser;
+    }
+
+    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;
-    }
-
-    public void setModiUser(Long modiUser) {
-        this.modiUser = modiUser;
     }
 
     public Date getModiTime() {
         return modiTime;
     }
 
-    public String getModiTime$(){
-        if (Cools.isEmpty(this.modiTime)){
+    public void setModiTime(Date modiTime) {
+        this.modiTime = modiTime;
+    }
+
+    public String getModiTime$() {
+        if (Cools.isEmpty(this.modiTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
-    }
-
-    public void setModiTime(Date modiTime) {
-        this.modiTime = modiTime;
     }
 
     public Long getAppeUser() {
         return appeUser;
     }
 
-    public String getAppeUser$(){
+    public void setAppeUser(Long appeUser) {
+        this.appeUser = appeUser;
+    }
+
+    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;
-    }
-
-    public void setAppeUser(Long appeUser) {
-        this.appeUser = appeUser;
     }
 
     public Date getAppeTime() {
         return appeTime;
     }
 
-    public String getAppeTime$(){
-        if (Cools.isEmpty(this.appeTime)){
+    public void setAppeTime(Date appeTime) {
+        this.appeTime = appeTime;
+    }
+
+    public String getAppeTime$() {
+        if (Cools.isEmpty(this.appeTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
-    }
-
-    public void setAppeTime(Date appeTime) {
-        this.appeTime = appeTime;
     }
 
 

--
Gitblit v1.9.1