From e94a80ae3d9733eb2d6a5d9bcbd50a624f058caa Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 19 十月 2022 17:39:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
index 746a93f..74d5930 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
@@ -136,6 +136,12 @@
     private String detailedAddress;
 
     /**
+     * 提交方式(1 小程序 2.门户网)
+     */
+    @ApiModelProperty("提交方式(1 小程序 2.门户网)")
+    private Integer  submitType;
+
+    /**
      * 创建时间
      */
     @ApiModelProperty("创建时间")
@@ -175,6 +181,19 @@
     @ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
     private  Integer serviceState;
 
+    /**
+     * 超时时间
+     */
+    @ApiModelProperty("超时时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime timeoutTime;
+
+    /**
+     * 是否推送过(1 是 2 否)
+     */
+    @ApiModelProperty("是否推送过(1 是 2 否)")
+    private Integer isPush;
+
     @TableField(exist = false)
     @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
     private String sumClassifyName;

--
Gitblit v1.7.1