From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
index 704b993..54f3e05 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
@@ -42,7 +42,7 @@
*/
@ApiModelProperty("用户id")
@JsonSerialize(using = ToStringSerializer.class)
- private Long userId;
+ private String userId;
/**
@@ -60,7 +60,7 @@
/**
* 用户类型（1系统后台用户 2导办人员用户）
*/
- @ApiModelProperty("用户类型（1系统后台用户 2导办人员用户）")
+ @ApiModelProperty("用户类型（1系统后台用户 2导办人员用户 3.普通用户 4.小程序用户")
private String userType;
@@ -164,6 +164,12 @@
@ApiModelProperty("角色id")
private String roleIds;
+ /**
+ * 前端使用
+ */
+ @ApiModelProperty("前端使用")
+ private String departmentIdStr;
+
/**
* 数据权限
*/
@@ -244,6 +250,42 @@
private Integer transactionNum;
+ @TableField(exist = false)
+ @ApiModelProperty("权限资格")
+ private String permission;
+ @TableField(exist = false)
+ @ApiModelProperty("角色名称")
+ private String roleName;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("创建人名称")
+ private String createName;
+
+ @ApiModelProperty("是否是部门领导（1是 2不是）")
+ private String isDivisionHead;
+
+ @ApiModelProperty("办理事项ids")
+ private String mattersIds;
+
+
+ @ApiModelProperty("部门ids")
+ private String departmentIds;
+
+
+ @ApiModelProperty("多部门ids")
+ private String moreDepartmentIds;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办理事项名称")
+ private String mattersNames;
+
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办结事项数目")
+ private String transactionEndNum;
}
--
Gitblit v1.7.1