From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 1740584..a39f196 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
@@ -13,6 +13,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@ApiModel("导办工单进展记录表")
@@ -53,10 +54,22 @@
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评价14.删除评论）
*/
- @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用户评价14.删除评论）")
private String state;
+
+
+ /**
+ * 工单号
+ */
+ @ApiModelProperty(name = "guideOrderNum", value = "工单号")
+ private String guideOrderNum;
+ /**
+ * 超时状态 是否超时 （1未超时 2超时）
+ */
+ @ApiModelProperty(name = "isTimeout", value = "超时状态 是否超时 （1未超时 2超时）")
+ private String isTimeout;
/**
* 备注内容
@@ -110,6 +123,13 @@
/**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "guidOrderNum", value = "工单号")
+ private String guidOrderNum;
+
+
+ /**
* 视频url
*/
@ApiModelProperty(name = "videoUrl", value = "视频url")
@@ -129,4 +149,12 @@
@ApiModelProperty(name = "toUserName", value = "接收人名字")
private String fromUserName;
+ @TableField(exist = false)
+ @ApiModelProperty(name = "elseAccessoryEntities", value = "其他附件列表")
+ private List<ElseAccessoryEntity> elseAccessoryEntities;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "transactionEvents", value = "推荐办事指南列表")
+ private List<TransactionEvent> transactionEvents;
+
}
--
Gitblit v1.7.1