From 11899dc62d10c1c7778fbebb631f5ee25705b7db Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 21:36:08 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 4e450ee..eacb605 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
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community.convenient;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -112,6 +113,12 @@
@ApiModelProperty("手机号")
private String mobilePhone;
+ @ApiModelProperty("店铺销量")
+ private Integer sale;
+
+ @ApiModelProperty("店铺销售额")
+ private BigDecimal saleVolume;
+
public void setPeriod(String period) {
this.period = MerchantBusinessPeriod.valueOf(period);
}
--
Gitblit v1.7.1