Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

21 小时以前 757a5a1373c96d216be9eb5d6b5cd6374ce95deb

 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){