From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java | 20 ++++++++++++++++++++
1 files changed, 20 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 a0f2d3b..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
@@ -55,4 +55,24 @@
private String keyword;
@ApiModelProperty("职务")
private String position;
+ @ApiModelProperty("参数id2")
+ private Integer paramId2;
+ @ApiModelProperty("社区id")
+ private Long communityId;
+ @ApiModelProperty("商家id")
+ private Long merchantId;
+ @ApiModelProperty("街道id")
+ private Long streetId;
+ @ApiModelProperty("分类2")
+ private Integer type2;
+ @ApiModelProperty("一级分类")
+ 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