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

huliguo

7 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

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

@@ -21,10 +21,10 @@
    private String keyword;

    @ApiModelProperty(value = "提交开始时间")
    private Date createStartTime;
    private String createStartTime;

    @ApiModelProperty(value = "提交结束时间")
    private Date createEndTime;
    private String createEndTime;

    @ApiModelProperty(value = "证书状态0待审核1审核通过2审核拒绝")
    private Integer cerStatus;