Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

7 天以前 d8d34b1eda59c88f8de91d889165f63132a29499

 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;
}