From 6a2315fc34c3d1db8fd4eb21c22472728407e67a Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 12 十月 2022 16:31:14 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java |   13 +++++++++++++
 1 files changed, 13 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..704b993 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,18 @@
     @ApiModelProperty("办结事项名称")
     private String transactionNames;
 
+    /**
+     * 微信小程序id
+     */
+    @ApiModelProperty("微信小程序id")
+    private String openid;
+
+    /**
+     * 待处理办事指南数量
+     */
+    @ApiModelProperty("待处理办事指南数量")
+    private Integer transactionNum;
+
 
 
 

--
Gitblit v1.7.1