From 726c2e196bac6e56f588736c68b07a933dabb127 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:40:16 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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..61e89a1 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,6 +42,7 @@
*/
@ApiModelProperty("用户id")
@JsonSerialize(using = ToStringSerializer.class)
+ @JsonFormat(shape =JsonFormat.Shape.STRING )
private Long userId;
@@ -244,6 +245,20 @@
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;
}
--
Gitblit v1.7.1