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

chen.lin

2 天以前 14f6548120b5d7f58ae2082454508a26ddac1db8

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