Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTrave...

luo

2024-01-31 30aa136c32028aa46fb8c4a50483288c6821cd9a

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

@@ -25,6 +25,9 @@
     */
    @Override
    public String queryByType(Integer type, Integer language) throws Exception {
        if(null == language){
            language = 2;
        }
        String s = agreementMapper.queryByType(type, language, 1);
        if(ToolUtil.isEmpty(s)){
            s = agreementMapper.queryByType(type, language, null);