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

1

3 天以前 2323e7ce37d12a689f00948a54d79f24a9b37561

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