Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-02 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3

 src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateUserDTO.java

@@ -72,6 +72,10 @@

    @ApiModelProperty(value = "指定的用户列表id")
    @NotNull(message = "指定的用户列表id不能为空")
    private List<String> pointCostomIdList;
    private List<Long> pointCostomIdList;


    @ApiModelProperty(value = "领取后有效类型名称")
    private String usageTimeTypeName;

}