Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

8 天以前 a6991a33e18f69264f93a63459a4b64ea799295a

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java

@@ -304,6 +304,7 @@
        return StringUtils.join(strings, ",");
    }


    public String getUseStatus$(){
        if (null == this.useStatus){ return null; }
        switch (this.useStatus){