Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

 src/main/java/com/mzl/flower/schedule/PointScheduleService.java

@@ -55,7 +55,7 @@
                    customerPointDetail.setChangeType(Constants.POINT_CHANGE_TYPE.reduce.name());
                    customerPointDetail.setType(Constants.POINT_TYPE.expired.name());
                    customerPointDetail.setPoint(expiredPoint);
                    customerPointDetail.setRecordDate(now);
                    customerPointDetail.setRecordDate(lastYear);
                    customerPointDetail.create("sys");
                    customerPointDetail.setRemarks(DateUtils.toString(now,"yyyy-MM-dd")+"过期积分结算");
                    customerPointDetailMapper.insert(customerPointDetail);