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/MerShopCertificateListDto.java

@@ -16,6 +16,6 @@
public class MerShopCertificateListDto extends MerBaseDto {


    @ApiModelProperty(name = "状态1审核通过2审核中")
    @ApiModelProperty(value = "状态1审核通过2审核中")
    private Integer status;
}