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

gongzuming

2024-09-10 6d6f3ecc111080094e91fd002e1990dcfa9783e6

 src/main/java/com/mzl/flower/dto/response/point/CustomerPointDTO.java

@@ -29,4 +29,6 @@
    @ApiModelProperty("过期积分")
    private String expiredPoint;

    @ApiModelProperty("系统扣减积分")
    private Integer deductionPoint;
}