Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs...

luxiaotao1123

2020-08-24 a8ab74fdbc4e590a4c9778d447538c3bc30925e4

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