Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

xuxueyang

2024-09-18 38d8abee8db1034b4cc3fae8613e8328653a1080

 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;