From 09c68ce0ddbaebde08d0d370b5bb4ab0b1532a73 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 15:03:02 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java
index 727dd20..dc5176e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java
@@ -2,6 +2,10 @@
import java.io.Serializable;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -9,10 +13,12 @@
* @author zts
*/
@Data
+@TableName("com_act_proceedings")
public class ComActProceedings implements Serializable {
/**
* 主键id
*/
+ @TableId
private Long id;
/**
@@ -38,12 +44,12 @@
/**
* 是否删除0否1是
*/
- private Boolean delFlag;
+ private Integer delFlag;
/**
* 状态0可用1禁用
*/
- private Boolean status;
+ private Integer status;
/**
* 创建时间
@@ -64,6 +70,12 @@
* 修改人
*/
private Date updateBy;
+ /**
+ * 工作时间
+ * */
+ private String workTime;
+ private String logo;
+
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
--
Gitblit v1.7.1