From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java
index 2bcca8f..0b49d07 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java
@@ -1,8 +1,11 @@
 package com.example.erp.entity.userInfo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
+
+import java.util.List;
 
 @Data  //get涓巗et浠g爜绠�鍐�
 public class User {
@@ -17,5 +20,8 @@
     private  String createTime;
     private  String updateTime;
     private  Integer state;
+    private  String optimizeParms;
+    @TableField(select = false,exist = false)
+    private  List<UserRole> userRoleList;
 
 }

--
Gitblit v1.8.0