Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-23 41fa9a0f2f5cd0ffc9bd96e11f00245ea3567b9b

 src/main/webapp/static/layuiadmin/json/menu1.js

@@ -180,7 +180,7 @@
      ,"spread": true
      ,"list": [{
        "name": "list"
        ,"title": "商品列表"
        ,"title": "物料列表"
      },{
        "name": "category"
        ,"title": "分类管理"