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

zhou zhou

4 天以前 94e3cc94d83f5ec1bb64e48360a15d057f3643d9

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

@@ -12,7 +12,8 @@
    IO_WORK("ioWork", "layui-icon-flag"),
    WORK_FLOW("workFlow", "layui-icon-form"),
    BASE("base", "layui-icon-file"),
    ORDER("erp", "layui-icon-senior")
    ORDER("erp", "layui-icon-senior"),
    SENSOR("sensor", "layui-icon-engine"),
    ;