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

zhou zhou

1 天以前 10776dd6f7f9ef9e47419427fcb1b692ed73d54d

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/LocStsType.java

@@ -43,7 +43,7 @@
     */

    public static String getLocSts(String val) {

        if (val.equals(RcsLocStsType.LOC_STS_TYPE_D.type)) {

            return LocStsType.LOC_STS_TYPE_D.type;

            return LocStsType.LOC_STS_TYPE_O.type;

        } else if (val.equals(RcsLocStsType.LOC_STS_TYPE_F.type)) {

            return LocStsType.LOC_STS_TYPE_F.type;

        } else if (val.equals(RcsLocStsType.LOC_STS_TYPE_S.type)) {