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

huliguo

17 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

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