From a15da474123b2edba25724bee86ea1ecb7a4153e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Wed, 27 Dec 2023 11:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=B0=86createUser=E8=B7=9FupdateUser=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E7=BF=BB=E8=AF=91=E6=88=90=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vip/xiaonuo/common/pojo/CommonEntity.java | 21 ++++++++++++++++---
 .../src/main/resources/application.properties |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/snowy-common/src/main/java/vip/xiaonuo/common/pojo/CommonEntity.java b/snowy-common/src/main/java/vip/xiaonuo/common/pojo/CommonEntity.java
index 66817772..3595b5dd 100644
--- a/snowy-common/src/main/java/vip/xiaonuo/common/pojo/CommonEntity.java
+++ b/snowy-common/src/main/java/vip/xiaonuo/common/pojo/CommonEntity.java
@@ -16,6 +16,9 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.TransPojo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -34,7 +37,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class CommonEntity implements Serializable {
+public class CommonEntity implements Serializable, TransPojo {
 
     /** 删除标志 */
     @JsonIgnore
@@ -51,15 +54,27 @@ public class CommonEntity implements Serializable {
     /** 创建人 */
     @ApiModelProperty(value = "创建人", position = 1001)
     @TableField(fill = FieldFill.INSERT)
+    @Trans(type = TransType.RPC, targetClassName = "vip.xiaonuo.sys.modular.user.entity.SysUser", fields = "name", alias = "createUser", ref = "createUser")
     private String createUser;
 
+    /** 创建人名称 */
+    @ApiModelProperty(value = "创建人名称", position = 1002)
+    @TableField(exist = false)
+    private String createUserName;
+
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间", position = 1002)
+    @ApiModelProperty(value = "更新时间", position = 1003)
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /** 更新人 */
-    @ApiModelProperty(value = "更新人", position = 1003)
+    @ApiModelProperty(value = "更新人", position = 1004)
     @TableField(fill = FieldFill.UPDATE)
+    @Trans(type = TransType.RPC, targetClassName = "vip.xiaonuo.sys.modular.user.entity.SysUser", fields = "name", alias = "updateUser", ref = "updateUserName")
     private String updateUser;
+
+    /** 更新人名称 */
+    @ApiModelProperty(value = "更新人名称", position = 1005)
+    @TableField(exist = false)
+    private String updateUserName;
 }
diff --git a/snowy-web-app/src/main/resources/application.properties b/snowy-web-app/src/main/resources/application.properties
index 33e8f287..f9b71363 100644
--- a/snowy-web-app/src/main/resources/application.properties
+++ b/snowy-web-app/src/main/resources/application.properties
@@ -125,6 +125,7 @@ mybatis-plus.type-handlers-package=vip.xiaonuo.common.handler
 easy-trans.is-enable-redis=true
 easy-trans.is-enable-global=true
 easy-trans.is-enable-tile=true
+easy-trans.is-enable-cloud=false
 
 #########################################
 # sa-token configuration