From 0baf54c6e64dc2c5c85059c577893866b6275e68 Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期一, 28 二月 2022 17:22:51 +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 | 2 ++
1 files changed, 2 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 8a63880..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
@@ -59,4 +59,6 @@
private Integer paramId2;
@ApiModelProperty("社区id")
private Long communityId;
+ @ApiModelProperty("商家id")
+ private Long merchantId;
}
--
Gitblit v1.7.1