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

yxh

6 天以前 c5a89587afa921a098262ff37f6f211ac2776059

 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();
    }
}