Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!600

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsCategoryMgrController.java

@@ -80,8 +80,10 @@ public class GoodsCategoryMgrController extends BaseApiController {
       goodsCategoryTreeVO.setGoodsCategoryList(list);
       return goodsCategoryTreeVO;
     }).collect(Collectors.toList());
+    TableDataInfo res = getDataTable(categoryList);
+    res.setRows(treeList);
 
-    return getDataTable(treeList);
+    return res;
   }