Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-02 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3

 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateCustomerVO.java

@@ -8,7 +8,7 @@
public class CouponTemplateCustomerVO extends AbstractTransDTO {

    @ApiModelProperty("用户id")
    private String id;
    private Long id;

    @ApiModelProperty("名称")
    private String name;