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

huliguo

10 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

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

@@ -19,10 +19,10 @@
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty("合作开始时间")
    private Date coopStartTime;
    @ApiModelProperty(value="合作开始时间")
    private String coopStartTime;

    @ApiModelProperty("合作结束时间")
    private Date coopEndTime;
    @ApiModelProperty(value="合作结束时间")
    private String coopEndTime;

}