From 2f38b2341e1572502fd6b4510670107f57ed261c Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期五, 18 八月 2023 23:05:34 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtChangeCoopDto.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtChangeCoopDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtChangeCoopDto.java index 64eae23..3bc1212 100644 --- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtChangeCoopDto.java +++ b/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; } -- Gitblit v1.7.1