From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java |   14 ++++++++++++++
 1 files changed, 14 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 2713cc2..d027a56 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
@@ -65,4 +65,18 @@
     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;
+    @ApiModelProperty("物业id")
+    private Long propertyId;
+    @ApiModelProperty("是否为物业查看报事报修")
+    private Integer propertyCheck;
 }

--
Gitblit v1.7.1