From 4e1bb5d40063abfa1f43206b4ba91a26fac1cae7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 22 二月 2022 09:45:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java |   10 ++++++++++
 1 files changed, 10 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 67d144f..23be99d 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
@@ -51,4 +51,14 @@
     private String serialNo;
     @ApiModelProperty("小区id")
     private Long areaId;
+    @ApiModelProperty("关键字")
+    private String keyword;
+    @ApiModelProperty("职务")
+    private String position;
+    @ApiModelProperty("参数id2")
+    private Integer paramId2;
+    @ApiModelProperty("社区id")
+    private Long communityId;
+    @ApiModelProperty("商家id")
+    private Long merchantId;
 }

--
Gitblit v1.7.1