Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-26 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063

 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;