Merge remote-tracking branch 'origin/dev' into dev

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -1717,7 +1717,7 @@
            String birthday = map.get("birthday").toString();
            map.put("birthday", DateUtil.conversionFormat(language, birthday));
        }
        double sum = paymentRecordService.queryRechargeMoneySum(uid);
        Double sum = paymentRecordService.queryRechargeMoneySum(uid);
        map.put("rechargeAmountSum",sum);
        return map;
    }