From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014
---
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 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 d20d3c1..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
@@ -1,7 +1,9 @@
package com.dg.core.db.gen.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -11,9 +13,11 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@ApiModel("导办工单进展记录表")
+@TableName("automessage_guide_evolve")
public class GuideEvolveEntity implements Serializable
{
/**
@@ -50,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评价）
*/
- @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;
/**
* 备注内容
@@ -105,4 +121,40 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "guidOrderNum", value = "工单号")
+ private String guidOrderNum;
+
+
+ /**
+ * 视频url
+ */
+ @ApiModelProperty(name = "videoUrl", value = "视频url")
+ private String videoUrl;
+
+ /**
+ * 图片url
+ */
+ @ApiModelProperty(name = "pictureUrl", value = "图片url")
+ private String pictureUrl;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "toUserName", value = "发起人名字")
+ private String toUserName;
+
+ @TableField(exist = false)
+ @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