From 27704b0f33dfa3b22f11d36124a8d08b720461f8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 19 十月 2022 13:27:20 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 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 42d30ea..8da1ee3 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
@@ -41,6 +41,7 @@
      * 用户id
      */
     @ApiModelProperty("用户id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
 
@@ -230,6 +231,31 @@
     @ApiModelProperty("办结事项名称")
     private String transactionNames;
 
+    /**
+     * 微信小程序id
+     */
+    @ApiModelProperty("微信小程序id")
+    private String openid;
+
+    /**
+     * 待处理办事指南数量
+     */
+    @ApiModelProperty("待处理办事指南数量")
+    private Integer transactionNum;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty("权限资格")
+    private String permission;
+
+    @TableField(exist = false)
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty("创建人名称")
+    private String createName;
 
 
 

--
Gitblit v1.7.1