From 0d60b1983ea908b81a0ce5f9a4ecc2fba1c00c4e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 15 十月 2022 15:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
index 32abf1b..a794789 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.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;
@@ -15,6 +16,7 @@
 
 @ApiModel("导办事项管理实体类")
 @Data
+@TableName("automessage_transaction_event")
 public class TransactionEvent implements Serializable
 {
     /**
@@ -37,15 +39,31 @@
     @ApiModelProperty("部门所属区域")
     private String departmentArea;
 
+     /**
+     * 部门电话
+     */
+    @ApiModelProperty("部门电话")
+    private String contactNumber;
+
     /**
      * 分类id
      */
     @ApiModelProperty("分类id")
     private String classifyId;
 
+    /**
+     * 所属分类等级
+     */
     @TableField(exist = false)
     @ApiModelProperty("所属分类等级")
     private String classifyName;
+
+    /**
+     * 部门名称
+     */
+    @TableField(exist = false)
+    @ApiModelProperty("部门名称")
+    private String departmentName;
     /**
      * 事项名称
      */
@@ -243,7 +261,11 @@
 
 
 
+    @ApiModelProperty(name = "operationalGuidelineVideoName", value = "操作指南视频名称")
+    private String  operationalGuidelineVideoName;
 
+    @ApiModelProperty(name = "operationalGuidelineName", value = "操作指南名称")
+    private  String  operationalGuidelineName;
 
 
 

--
Gitblit v1.7.1