Merge remote-tracking branch 'origin/jsxswms' into jsxswms

zhou zhou

4 天以前 94e3cc94d83f5ec1bb64e48360a15d057f3643d9

 src/main/java/com/zy/common/model/enums/SysOsType.java

@@ -6,7 +6,7 @@
    Linux("Linux", null),
    Mac_OS("Mac OS", null),
    Mac_OS_X("Mac OS X", null),
    Windows("Windows", "D:\\WMS系统激活码（请勿删除）.txt"),
    Windows("Windows", "D:\\licensed.txt"),
    OS2("OS/2", null),
    Solaris("Solaris", null),
    SunOS("SunOS", null),