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/IUserActivityBalanceService.java

@@ -15,5 +15,5 @@
     * @return
     * @throws Exception
     */
    List<Map<String, Object>> query(Double money, Integer companyId) throws Exception;
    List<Map<String, Object>> query(Integer language, Double money, Integer companyId) throws Exception;
}