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

huliguo

14 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 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;
}