Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-13 d02a6b2cf6f0030456fd7ea568570f3df0dd7291

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