From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java |   14 ++++++++++++++
 1 files changed, 14 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 04949bc..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
@@ -13,6 +13,7 @@
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @ApiModel("回复模板实体类")
 @Data
@@ -132,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