From ea35ef67991d7eb3ccdb286b2945d0e69da5b77f Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期四, 06 三月 2025 16:50:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java
index eb50fe3..2662b2d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java
@@ -96,5 +96,8 @@
     @ApiModelProperty(value = "澶囨敞")
     private String remark;
 
+    @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�")
+    private String companyId;
+
 }
 

--
Gitblit v1.9.3