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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

 src/main/java/com/mzl/flower/service/system/UserService.java

@@ -201,7 +201,7 @@
            if(customerPoint == null){
                result.setCurrentPoint(0);
            }else{
                Integer currentPoint =customerPoint.getTotalPoint()-customerPoint.getUsedPoint()-customerPoint.getExpiredPoint();
                Integer currentPoint =customerPoint.getTotalPoint()-customerPoint.getUsedPoint()-customerPoint.getExpiredPoint()-customerPoint.getDeductionPoint();
                result.setCurrentPoint(currentPoint>=0?currentPoint:0);
            }
        }else if(Constants.USER_TYPE.supplier.name().equals(user.getType())){