Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthPageDto.java

@@ -37,4 +37,7 @@
            "        7：FROZEN：已冻结\n" +
            "        8：CANCELED：已作废")
    private Integer auditStatus;

    @ApiModelProperty(value="商户状态")
    private Integer shopStatus;
}