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

zhibing.pu

2024-05-13 7ea05c419cb4cdf92f2c1a747ff0570aca226d20

 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;

}