From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +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/ComActSocialOrg.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/ComActSocialOrg.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java
index 4879e3a..d157a51 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java
@@ -34,7 +34,7 @@
* ID
*/
@ApiModelProperty(value = "ID")
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -249,4 +249,45 @@
@ApiModelProperty(value = "登录用户id")
private Long userId;
+ private String password;
+
+ @ApiModelProperty("状态")
+ private Integer status;
+
+ @ApiModelProperty("成立方式")
+ private Integer buildType;
+
+ @ApiModelProperty("经度")
+ private String longitude;
+
+ @ApiModelProperty("纬度")
+ private String latitude;
+
+ @ApiModelProperty("服务类型")
+ private String serviceType;
+
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ @ApiModelProperty("是否三社 0否1是")
+ private Integer isSociety;
+
+ @ApiModelProperty("孵化单位")
+ private Long hatchUnit;
+
+ @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
+ private Integer hatchUnitType;
+
+ @ApiModelProperty("孵化单位名称")
+ private String hatchUnitName;
+
+ @ApiModelProperty("挂靠单位")
+ private Long affiliatedUnit;
+
+ @ApiModelProperty("挂靠单位类型（1.街道 2.社区）")
+ private Integer affiliatedUnitType;
+
+ @ApiModelProperty("挂靠单位名称")
+ private String affiliatedUnitName;
+
}
--
Gitblit v1.7.1