From 15fa429882915d83cb91a2b4e971ebdb46e1cbb6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 13:21:11 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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..b2b7dc8 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
@@ -100,9 +100,9 @@
private String guideDepartmentId;
/**
- * 状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6 已超时 7超时未办结 8未解决 9已解决）
+ * 状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消）
*/
- @ApiModelProperty("状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6 已超时 7超时未办结 8未解决 9已解决）")
+ @ApiModelProperty("状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消）")
private String state;
/**
@@ -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