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

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java
index dfc3040..92c6f9f 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java
@@ -44,6 +44,13 @@
     @ApiModelProperty("系统通知时间")
     private Integer timeoutNotificationNum;
 
+
+    /**
+     * 系统提醒时间
+     */
+    @ApiModelProperty("系统提醒时间")
+    private Integer timeoutRemindNum;
+
     /**
      * 创建时间
      */
@@ -66,7 +73,7 @@
      * 修改人id
      */
     @ApiModelProperty("修改人id")
-    private Integer updateUserId;
+    private String updateUserId;
 
     /**
      * 小程序二维码

--
Gitblit v1.7.1