From 4b8fe07fd108733d6295f17ef99229196ed7a897 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 18:06:42 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 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 4b9b404..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("创建时间")
@@ -155,6 +161,9 @@
@ApiModelProperty(name = "video", value = "视频地址")
private String video;
+ @ApiModelProperty(name = "isTimeout", value = "是否超时 （1 未超时 2已超时）")
+ private String isTimeout;
+
@TableField(exist = false)
@ApiModelProperty(name = "guideRepairOrderList", value = "工单处理进度")
List<GuideEvolveEntity> guideEvolveEntities;
@@ -171,6 +180,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 = "完整分类名称")
@@ -196,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