From 7dd58dc53f80b671b58d60541314e897ef4c138b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 14:13:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java
index 5110a13..c8ac4a2 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java
@@ -1,8 +1,10 @@
package com.dg.core.db.gen.entity;
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -47,7 +49,7 @@
/**
* 跳转链接类型（1.富文本2.微信文章）
*/
- @ApiModelProperty("名称")
+ @ApiModelProperty(" 跳转链接类型（1.富文本2.微信文章）")
private String linkType;
/**
@@ -72,18 +74,20 @@
* 创建时间
*/
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 创建人
*/
@ApiModelProperty("创建人")
- private Integer createUserId;
+ private String createUserId;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@@ -91,5 +95,30 @@
* 修改人
*/
@ApiModelProperty("修改人")
- private Integer updateUserId;
+ private String updateUserId;
+
+ /**
+ * 部门名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("部门名称")
+ private String departmentName;
+
+ /**
+ * 修改人名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("修改人名称")
+ private String updateUserName;
+
+ /**
+ * 创建人名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("创建人名称")
+ private String createUserName;
+
+ @TableField(exist = false)
+ @ApiModelProperty("是否能够删除1.可以删除修改 2.不能删除修改")
+ private Integer isDelete;
}
--
Gitblit v1.7.1