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/ReplyTemplateEntity.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java
index 77f2e3e..d97bc4d 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java
@@ -3,6 +3,7 @@
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;
@@ -12,9 +13,11 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
@ApiModel("回复模板实体类")
@Data
+@TableName
public class ReplyTemplateEntity implements Serializable
{
/**
@@ -130,5 +133,18 @@
@ApiModelProperty("附件id")
private String accessoryId;
+ /**
+ * 附件列表
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("附件列表")
+ private List<ElseAccessoryEntity> elseAccessoryEntityList;
+
+ /**
+ * 推荐办事指南列表
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("推荐办事指南列表")
+ private List<TransactionEvent> transactionEventList;
}
--
Gitblit v1.7.1