Merge remote-tracking branch 'origin/master'

nladmin-ui/src/components/Crud/crud.js

@@ -140,7 +140,6 @@ function CRUD(options) {
         crud.loading = true
         // 请求数据
         initData(crud.url, crud.getQueryParams()).then(data => {
-          console.log(data)
           const table = crud.getTable()
           if (table && table.lazy) { // 懒加载子节点数据，清掉已加载的数据
             table.store.states.treeData = {}

nladmin-ui/src/views/system/dict/index.vue

@@ -77,7 +77,7 @@
 
 <script>
 import checkPermission from '@/utils/permission'
-import dictDetail from './dictDetail'
+import dictDetail from './dictDetail.vue'
 import crudDict from '@/views/system/dict/dict'
 
 import CRUD, { presenter, header, form } from '@crud/crud'