From d0565d28bafce1688c2423e43a94ea43923b664a Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 一月 2025 17:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/domain/User.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/domain/User.java b/ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/domain/User.java
index da29d4c..a87283e 100644
--- a/ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/domain/User.java
+++ b/ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/domain/User.java
@@ -23,6 +23,9 @@
     /** 手机号 */
     private String phone;
 
+    /** 头像 */
+    private String avatar;
+
     /** 状态:1-激活 2-禁用 */
     private Integer status;
 
@@ -31,6 +34,10 @@
 
     /** 更新时间 */
     private LocalDateTime updateTime;
+    /** 创建人 */
+    private Long createBy;
+    /** 更新人 */
+    private Long updateBy;
 
     /** 是否删除 */
     @TableLogic

--
Gitblit v1.7.1