Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd

yxh

4 天以前 d42096fd55c4b0caf84bb4f208b4e17534e158c1

 ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -531,4 +531,8 @@
    {
        return (T) obj;
    }

    public static String nullTo1(Object s){
        return s==null?"1":s.toString();
    }
}