From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 4839e0d..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浠ｇ爜绠�鍐�
public class User {
@@ -10,12 +13,15 @@
@TableId(type = IdType.AUTO)
private Integer id;
private String loginName;
- private String passWord;
+ private String password;
private String userName;
private String address;
private String phone;
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