From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java |   12 ++++++++++++
 1 files changed, 12 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 2f90297..d2673a9 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
@@ -57,4 +57,16 @@
     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;
 }

--
Gitblit v1.7.1