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

zhibing.pu

2024-08-21 f47d695f19bca1e58ddedcc10f8d3dff7d7f8f1d

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GrantCouponDto.java

@@ -13,7 +13,7 @@
    private String userIds;
    @ApiModelProperty("优惠券id")
    private Integer couponId;
    @ApiModelProperty("发放方式 1积分 2现金")
    @ApiModelProperty("发放方式 1积分 2现金 3=后台赠送前端忽略")
    private Integer waysToObtain;
    @ApiModelProperty("结束时间 前端忽略")
    private LocalDateTime endTime;