From 1afb2a9df1a582efac30c8c12e01fdeab8b60ec7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 09:52: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/TransactionEvent.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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..9c9b8ec 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,32 @@
@ApiModelProperty("部门所属区域")
private String departmentArea;
+ /**
+ * 部门电话
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("部门电话")
+ private String contactNumber;
+
/**
* 分类id
*/
@ApiModelProperty("分类id")
private String classifyId;
+ /**
+ * 所属分类等级
+ */
@TableField(exist = false)
@ApiModelProperty("所属分类等级")
private String classifyName;
+
+ /**
+ * 部门名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("部门名称")
+ private String departmentName;
/**
* 事项名称
*/
@@ -228,6 +247,15 @@
private String commonProblemName;
+ @ApiModelProperty("办理区域")
+ private String transactionArea;
+
+ @ApiModelProperty("办理区域url")
+ private String transactionAreaUrl;
+
+ @ApiModelProperty("办理区域文件名称")
+ private String transactionAreaName;
+
@TableField(exist = false)
@ApiModelProperty(name = "sumTransactionNum", value = "导办服务数量")
@@ -243,8 +271,13 @@
+ @ApiModelProperty(name = "operationalGuidelineVideoName", value = "操作指南视频名称")
+ private String operationalGuidelineVideoName;
+ @ApiModelProperty(name = "operationalGuidelineName", value = "操作指南名称")
+ private String operationalGuidelineName;
-
+ @ApiModelProperty(name = "classifyIds", value = "前端使用")
+ private String classifyIds;
}
--
Gitblit v1.7.1