From 23802c625b4f78dbd30db82d1b9e5a839b4071c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 16:41:54 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
index 087b9ee..162b304 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
@@ -93,7 +93,7 @@
private Integer accountStatus;
@ApiModelProperty("所属社区id")
- private Long communityId;
+ private String communityId;
@ApiModelProperty("所属社区名称")
private String communityName;
@@ -102,7 +102,7 @@
private String serviceScope;
@ApiModelProperty("服务类型id列表")
- private List<Long> serviceIds;
+ private List<String> serviceIds;
@ApiModelProperty("该商家存有商品，最多返回两条")
private List<ConvenientProductVO> productVOList;
--
Gitblit v1.7.1