Merge branch 'master' of http://47.111.78.178:8012/root/yinnihailiang_one

# Conflicts:
#	lms/nladmin-system/src/main/resources/language/i18n/zh.js

lms/nladmin-ui/src/components/Crud/CRUD.operation.vue

@@ -12,7 +12,7 @@
         icon="el-icon-plus"
         @click="crud.toAdd"
       >
-           {{ $t('common.Create') }}
+        {{ $t('common.Create') }}
       </el-button>
       <el-button
         v-if="crud.optShow.edit"
@@ -24,7 +24,7 @@
         :disabled="crud.selections.length !== 1"
         @click="crud.toEdit(crud.selections[0])"
       >
-         {{ $t('common.Update') }}
+        {{ $t('common.Update') }}
       </el-button>
       <el-button
         v-if="crud.optShow.del"
@@ -38,7 +38,7 @@
         :disabled="crud.selections.length === 0"
         @click="toDelete(crud.selections)"
       >
-              {{ $t('common.Delete') }}
+        {{ $t('common.Delete') }}
       </el-button>
       <el-button
         v-if="crud.optShow.download"