From bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:44:43 +0800
Subject: [PATCH] Merge branch 'shuangzheng2' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
index d2673a9..261664f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
@@ -69,4 +69,10 @@
private Integer columnId;
@ApiModelProperty("二级分类")
private Integer secondColumnId;
+ @ApiModelProperty(value = "是否公示（1.是 2.否）")
+ private Integer isPublicity;
+ @ApiModelProperty(value = "账号类型 1街道 2社区 3社会组织", hidden = true)
+ private Integer userType;
+ @ApiModelProperty(value = "社会组织id", hidden = true)
+ private Long orgId;
}
--
Gitblit v1.7.1