Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-20 f04bb37f47ff1eb51e5e8c42d73514c1e9c33710

 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;