Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

 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