From bd02bce2ce2c492862787e7c6590fbd4d9e714e7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 11:42:12 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 84549eb..a28568c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -116,12 +116,14 @@
* 角色类型 1=平台 2=公司 3=门店 4=修理厂
*/
@ApiModelProperty(value = "角色类型 1=平台 2=门店")
+ @TableField("role_type")
private Integer roleType;
@Excel(name = "密码修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date passWordUpdate;
@ApiModelProperty(value = "对象ID")
+ @TableField("objectId")
private Integer objectId;
@ApiModelProperty(value = "备注")
--
Gitblit v1.7.1