From b69d2017fecdad6a1c9a09c0006e70ecea9efed0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 17 十月 2022 18:39:41 +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 0784a57..9be6cc9 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;
 
 
@@ -236,6 +237,20 @@
     @ApiModelProperty("微信小程序id")
     private String openid;
 
+    /**
+     * 待处理办事指南数量
+     */
+    @ApiModelProperty("待处理办事指南数量")
+    private Integer transactionNum;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty("权限资格")
+    private String permission;
+
+    @TableField(exist = false)
+    @ApiModelProperty("角色名称")
+    private String roleName;
 
 
 

--
Gitblit v1.7.1