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

czkh

2 天以前 975823f4d07c91a67162f553be9ff4ac25f3d47d

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

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