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

luo

2024-01-30 cf487b4baf05048e8929b47d73efc83d6a09162c

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

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

}