From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +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/ComActSocialProject.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java
index ead0e01..9268694 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java
@@ -1,9 +1,12 @@
package com.panzhihua.service_community.entity;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -30,7 +33,7 @@
private static final long serialVersionUID = -24945028672614601L;
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -110,4 +113,42 @@
*/
@ApiModelProperty(value = "浏览量")
private Integer views;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private Long columnId;
+
+ /**
+ * 二级分类id
+ */
+ @ApiModelProperty(value = "二级分类id")
+ private Long secondColumnId;
+
+ @ApiModelProperty(value = "责任方类型 1街道 2社区 3社会组织")
+ private Integer responsibilityType;
+
+ @ApiModelProperty(value = "责任方id")
+ private Long responsibilityId;
+
+ /**
+ * 联系电话
+ */
+ private String phone;
+
+ /**
+ * 项目资金
+ */
+ private BigDecimal funds;
+
+ /**
+ * 项目报名截止时间
+ */
+ private Date signUpEnd;
+
+ /**
+ * 是否公示（1.是 2.否）
+ */
+ private Integer isPublicity;
}
--
Gitblit v1.7.1