From 7b7ae2fbc3c43cf08949b2fd8949ea6c17b3c129 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 14 十一月 2022 17:43:00 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java
index 0129ad2..98d8eae 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java
@@ -54,11 +54,23 @@
private String fromUserId;
/**
- * 状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消6 已超时 7超时未办结 8未解决 9已解决 10 系统自动分配 11 回复 12转派 13手动分配）
+ * state", value = "状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配12默认好评13评价）
*/
- @ApiModelProperty(name = "state", value = "状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消6 已超时 7超时未办结 8未解决 9已解决 10 系统自动分配 11 回复 12转派 13手动分配）")
+ @ApiModelProperty(name = "state", value = "状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配 12默认好评 13用户评价）")
private String state;
+
+ /**
+ * 工单号
+ */
+ @ApiModelProperty(name = "guideOrderNum", value = "工单号")
+ private String guideOrderNum;
+ /**
+ * 超时状态 是否超时 （1未超时 2超时）
+ */
+ @ApiModelProperty(name = "isTimeout", value = "超时状态 是否超时 （1未超时 2超时）")
+ private String isTimeout;
+
/**
* 备注内容
*/
--
Gitblit v1.7.1