Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/relateTable/index.vue

@@ -1216,14 +1216,14 @@ export default {
         this.tableItemForm.title = row.dtName;
         this.tableItemForm.tableName = row.dtTableName;
         this.tableItemForm.selectFields = row.primaryKey;
-        this.tableItemForm.timeFormate = row.timeFormate;
+        this.tableItemForm.timeFormate = row.timeFormat;
       } else {
         this.tableItemForm.rowId = row.rowId; //未知字段
         this.tableItemForm.title = row.dtName;
         this.tableItemForm.selectFields = row.selectFields;
         this.tableItemForm.tableName = row.dtTableName;
         this.tableItemForm.orderByColumn = row.orderByColumn;
-        this.tableItemForm.timeFormate = row.timeFormate;
+        this.tableItemForm.timeFormate = row.timeFormat;
         // this.tableItemForm.isAsc = row.sortOrder;
         this.$set(this.tableItemForm, "isAsc", row.sortOrder);
         this.tableItemForm.selectFields = row.primaryKey;