Merge remote-tracking branch 'origin/cj_dev' into leng_dev

package.json

@@ -6,7 +6,8 @@
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
     "dev": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
+    "lint": "vue-cli-service lint",
+    "analyze": "vue-cli-service build --report"
   },
   "dependencies": {
     "@chenfengyuan/vue-qrcode": "^1.0.1",

src/const/crud/admin/tenant.js

@@ -54,7 +54,7 @@ export const tableOption = {
     {
       label: '开始时间',
       prop: 'startTime',
-      type: 'datetime',
+      type: 'date',
       format: 'yyyy-MM-dd',
       valueFormat: 'yyyy-MM-dd',
       rules: [{
@@ -66,7 +66,7 @@ export const tableOption = {
     {
       label: '结束时间',
       prop: 'endTime',
-      type: 'datetime',
+      type: 'date',
       format: 'yyyy-MM-dd',
       valueFormat: 'yyyy-MM-dd',
       rules: [{