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/TransactionEvent.java | 78 ++++++++++++++++++++++++++-------------
1 files changed, 52 insertions(+), 26 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..4c34392 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;
/**
* 事项名称
*/
@@ -77,15 +96,15 @@
private String basicInformation;
/**
- * 受理条件
+ * 现场申报
*/
- @ApiModelProperty("受理条件")
+ @ApiModelProperty("现场申报")
private String acceptConditions;
/**
- * 申请材料
+ * 办理区域
*/
- @ApiModelProperty("申请材料")
+ @ApiModelProperty("办理区域")
private String applicationMaterial;
/**
@@ -95,9 +114,9 @@
private String handlingProcedures;
/**
- * 收费标准
+ * 网上申报
*/
- @ApiModelProperty("收费标准")
+ @ApiModelProperty("网上申报")
private String rates;
/**
@@ -113,7 +132,6 @@
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
-
/**
* 联想词内容 , 连接
@@ -132,14 +150,14 @@
@ApiModelProperty("基础信息附件url")
private String basicInformationUrl;
/**
- * 受理条件附件url
+ * 现场申报附件url
*/
- @ApiModelProperty("受理条件附件url")
+ @ApiModelProperty("现场申报附件url")
private String acceptConditionsUrl;
/**
- * 申请材料附件url
+ * 办理区域附件url
*/
- @ApiModelProperty("申请材料附件url")
+ @ApiModelProperty("办理区域附件url")
private String applicationMaterialUrl;
/**
* 办理流程附件url
@@ -147,9 +165,9 @@
@ApiModelProperty("办理流程附件url")
private String handlingProceduresUrl;
/**
- * 收费标准附件url
+ * 网上申报附件url
*/
- @ApiModelProperty("收费标准附件url")
+ @ApiModelProperty("网上申报附件url")
private String ratesUrl;
/**
* 基础信息附件url
@@ -157,14 +175,14 @@
@ApiModelProperty("基础信息附件url")
private String basicInformationFileName;
/**
- * 附件url
+ * 现场申报附件url
*/
- @ApiModelProperty("附件url")
+ @ApiModelProperty("现场申报附件url")
private String acceptConditionsFileName;
/**
- * 申请材料文件名称
+ * 办理区域文件名称
*/
- @ApiModelProperty("申请材料文件名称")
+ @ApiModelProperty("办理区域文件名称")
private String applicationMaterialFileName;
/**
* 办理流程文件名称
@@ -172,11 +190,10 @@
@ApiModelProperty("办理流程文件名称")
private String handlingProceduresFileName;
/**
- * 收费标准文件名称
+ * 网上申报文件名称
*/
- @ApiModelProperty("收费标准文件名称")
+ @ApiModelProperty("网上申报文件名称")
private String ratesFileName;
-
/**
* 操作指引附件url
@@ -184,14 +201,11 @@
@ApiModelProperty("操作指引附件url")
private String operationalGuidelineUrl;
-
/**
* 操作指引视频url
*/
@ApiModelProperty("操作指引视频url")
private String operationalGuidelineVideoUrl;
-
-
/**
* 设定依据
@@ -228,6 +242,15 @@
private String commonProblemName;
+ @ApiModelProperty("手机移动端申报")
+ private String transactionArea;
+
+ @ApiModelProperty("手机移动端申报url")
+ private String transactionAreaUrl;
+
+ @ApiModelProperty("手机移动端申报文件名称")
+ private String transactionAreaName;
+
@TableField(exist = false)
@ApiModelProperty(name = "sumTransactionNum", value = "导办服务数量")
@@ -241,10 +264,13 @@
@ApiModelProperty(name = "sumClassifyName", value = "分类总名称")
String sumClassifyName;
+ @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