Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 e3c5378b79d23f4cebb4059c78bfbdd32cd5a2f9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java

@@ -19,7 +19,7 @@
@ApiModel("商城店铺")
public class PageShopStoreVO {

    @ApiModelProperty("负责人")
    @ApiModelProperty("商家、联系人")
    private String contacts;

    @ApiModelProperty("店铺登陆账号")
@@ -57,6 +57,9 @@
    @ApiModelProperty("店铺销量")
    private Integer sale;

    @ApiModelProperty("店铺登陆密码")
    private String storePassword;

    @ApiModelProperty("店内商品列表")
    private List<ComShopGoodsVO> goodsList;