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

luo

2024-02-19 704784eeca74c4d96ed335ed121809520f9a76f4

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

@@ -26,5 +26,5 @@
     * @return
     * @throws Exception
     */
    List<Map<String, Object>> queryConvertHistory(Integer pageNum, Integer size, Integer uid) throws Exception;
    List<Map<String, Object>> queryConvertHistory(Integer pageNum, Integer size, Integer uid,Integer language) throws Exception;
}