From b3ec53a9da0c09dd03da33bfc27f278d13a5d8f9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 16 二月 2023 19:08:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java
index 64b5373..58a9ed9 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
@@ -42,6 +43,7 @@
/**
* 密码修改时间
*/
+ @TableField(value = "pass_word_update")
private Date passWordUpdate;
/**
* md5密码盐
@@ -90,10 +92,12 @@
/**
* 角色类型 1=平台 2=分公司 3=加盟商
*/
+ @TableField(value = "role_type")
private Integer roleType;
/**
* 对象ID
*/
+ @TableField(value = "object_id")
private Integer objectId;
public Integer getRoleType() {
--
Gitblit v1.7.1