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/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);