From 4a7944290c83632bde74d0f0c45a142cf4a782dd Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 17 十月 2022 10:34:47 +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 |   13 +++++++++++++
 1 files changed, 13 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 d07e538..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
@@ -181,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