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

xuxueyang

2024-09-18 38d8abee8db1034b4cc3fae8613e8328653a1080

 src/main/java/com/mzl/flower/entity/point/CustomerPoint.java

@@ -26,4 +26,7 @@

    @ApiModelProperty("过期积分")
    private Integer expiredPoint;

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