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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

 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;