Merge branch 'test' into 'master'

罗yu 元桥

2021-04-30 8f64f78511bd79bcb75b66a3f918ce1e32c7704b

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

@@ -63,4 +63,7 @@
    @ApiModelProperty("店内商品列表")
    private List<ComShopGoodsVO> goodsList;

    @ApiModelProperty("该商家是否订单完成")
    private Boolean orderDone;

}