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

luxiaotao1123

2020-08-17 598a8da13e64b182312e5e14bfeba132f0422cd1

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

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