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

cloudroam

2024-10-12 d390d8f502436eaa17ee8ca7abd3c3f8a11a8514

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

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

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

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