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

zhou zhou

20 小时以前 757a5a1373c96d216be9eb5d6b5cd6374ce95deb

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

@@ -16,10 +16,10 @@
    ;

    QlyIsptStatus(String val, String desc) {
        this.val = val;
        this.val = Short.parseShort(val);
        this.desc = desc;
    }

    public String val;
    public Short val;
    public String desc;
}