From fde937ab595fdb946bed4537e41b398323d8df8b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 11 十月 2022 09:37:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 319d323..0129ad2 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,6 +1,7 @@
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;
@@ -12,6 +13,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@ApiModel("导办工单进展记录表")
@@ -109,6 +111,13 @@
/**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "guidOrderNum", value = "工单号")
+ private String guidOrderNum;
+
+
+ /**
* 视频url
*/
@ApiModelProperty(name = "videoUrl", value = "视频url")
@@ -120,4 +129,20 @@
@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