From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +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 |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 463cb51..d07e538 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;
@@ -166,7 +175,7 @@
     @ApiModelProperty(name = "suggest", value = "建议")
     private String suggest;
 
-    @ApiModelProperty(name = "evaluateState", value = "评价状态")
+    @ApiModelProperty(name = "evaluateState", value = "评价状态(1 满意  2不满意)")
     private String evaluateState;
 
     @ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
@@ -196,6 +205,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