Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/treetable-lay/treetable.js

@@ -43,11 +43,11 @@
                                mData[len - 1].isParent = true;
                            }
                            mData.push(data[i]);
                            sort(data[i].id, data);
                            sort(""+data[i].id, data);
                        }
                    }
                };
                sort(param.treeSpid, tNodes);
                sort(""+param.treeSpid, tNodes);

                // 重写参数
                param.url = undefined;