From 38596b03540250dd7de85c49f53ece5dd6bfe5b7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 13:19:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java | 11 +++++++++--
1 files changed, 9 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..dd0f6a7 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,8 @@
import java.io.Serializable;
import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -38,12 +40,12 @@
/**
* 是否删除0否1是
*/
- private Boolean delFlag;
+ private Integer delFlag;
/**
* 状态0可用1禁用
*/
- private Boolean status;
+ private Integer status;
/**
* 创建时间
@@ -64,6 +66,11 @@
* 修改人
*/
private Date updateBy;
+ /**
+ * 工作时间
+ * */
+ private String workTime;
+
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
--
Gitblit v1.7.1