From b74faa19bd619213d4de8772b1816c2f87c29449 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Aug 2022 15:44:50 +0800
Subject: [PATCH] Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve

---
 src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java
index 6179e1c..2fd39c8 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java
@@ -47,8 +47,11 @@
     //拓展备注
     private String remark;
     //所属ID
-    private Long belongId;
+    private Long companyId;
 
     @TableField(exist = false)
     private String roleName;
+
+    @TableField(exist = false)
+    private Long roleId;
 }

--
Gitblit v1.9.1