Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 9b426ebdbe9d283cd6f01719db9a00f2533df286

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

@@ -12,5 +12,5 @@
     * @return
     * @throws Exception
     */
    String queryByType(Integer type) throws Exception;
    String queryByType(Integer type, Integer language) throws Exception;
}