Merge branch 'basic' of https://github.com/iczer/vue-antd-admin into basic

src/components/table/StandardTable.vue

@@ -45,7 +45,10 @@ export default {
       type: [String, Function],
       default: 'key'
     },
-    pagination: Object,
+    pagination: {
+      type: [Object, Boolean],
+      default: true
+    },
     selectedRows: Array
   },
   data () {

src/utils/colors.js

@@ -1,5 +1,5 @@
 const varyColor = require('webpack-theme-color-replacer/client/varyColor')
-const generate =  require('@ant-design/colors/lib/generate').default
+const generate =  require('@ant-design/colors').generate
 const {ADMIN, ANTD} = require('../config/default')
 const Config = require('../config')