Merge remote-tracking branch 'origin/test' into test

DESKTOP-71BH0QO\L、ming

2021-05-11 6d90aa0d86d4ef7d1eb4eda5dab1c10dc9e9df26

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

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

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

    @ApiModelProperty("删除状态（1.未删除  2.已删除）")
    private Integer deleteStatus;

}