合并冲突

licp

2024-07-17 b570615eb2c3e1c5f3f2a3dc046d00a64fc2a39e

 static/js/menu.js

@@ -80,7 +80,7 @@
      }, {
         v: "人员考评",
         i: "font icon-erjidaohang",
         u: "",
         u: "b3-personnel-evaluation",
         p: ""
      }, {
         v: "人员考核",