Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

44323

2024-01-24 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c

 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;

}