From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
index 619fec3..7a3716f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
@@ -35,7 +35,7 @@
* 成立时间
*/
@ApiModelProperty(value = "成立时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date buildDate;
/**
@@ -210,7 +210,7 @@
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createAt;
/**
@@ -223,7 +223,7 @@
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateAt;
private Long communityId;
@@ -242,4 +242,40 @@
@ApiModelProperty("权限id")
private Long roleId;
+
+ @ApiModelProperty("状态")
+ private Integer status;
+
+ @ApiModelProperty("成立方式 1社区孵化 2民政注册")
+ private Integer buildType;
+
+ @ApiModelProperty("经度")
+ private String longitude;
+
+ @ApiModelProperty("纬度")
+ private String latitude;
+
+ @ApiModelProperty("服务类型")
+ private Long serviceType;
+
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ @ApiModelProperty("服务类型名称")
+ private String serviceName;
+
+ @ApiModelProperty("所属机构名称")
+ private String streetName;
+
+ @ApiModelProperty("是否三社 0否1是")
+ private Integer isSociety;
+
+ /**
+ * 描述
+ */
+ @ApiModelProperty("描述")
+ private String description;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
}
--
Gitblit v1.7.1