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

cloudroam

2024-12-29 a02bed07c8281ae0fda850921eb7443393c5fb0c

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

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

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

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