From c7a1a16c8d22b64f9025e800ebaf89b19b530228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:14:05 +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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 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 e09f11f..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;
/**
@@ -134,6 +134,12 @@
*/
@ApiModelProperty("详情地址")
private String detailedAddress;
+
+ /**
+ * 提交方式（1 小程序 2.门户网)
+ */
+ @ApiModelProperty("提交方式（1 小程序 2.门户网）")
+ private Integer submitType;
/**
* 创建时间
@@ -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;
@@ -199,6 +218,10 @@
@ApiModelProperty(name = "guideDepartmentName", value = "导办部门")
private String guideDepartmentName;
+ @TableField(exist = false)
+ @ApiModelProperty(name = "areaName", value = "所属地区名字")
+ private String areaName;
+
@Override
public String toString() {
return "GuideRepairOrder{" +
--
Gitblit v1.7.1