合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

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

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