Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-06 4f228194f4ad92a1207352515948adf610235658

 src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java

@@ -20,8 +20,7 @@
    private int startPoint;

    @ApiModelProperty("成长点-区间-结束")
    @NotNull
    private int endPoint;
    private Integer endPoint;

    @ApiModelProperty("会员折扣类型（百分比、固定金额）")
    @NotNull