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

CeDo

2021-05-08 e37e7842a5019c64af9213fb763ea322530ac704

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

@@ -66,4 +66,7 @@
    @ApiModelProperty("该商家是否订单完成")
    private Boolean orderDone;

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

}