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/system/entity/Fields.java

@@ -152,9 +152,9 @@
        if (null == this.unique){ return null; }
        switch (this.unique){
            case 0:
                return " 非唯一";
                return "主数据";
            case   1:
                return "  唯一";
                return "业务数据";
            default:
                return String.valueOf(this.unique);
        }