From c9cd6393018400860710b33a5e1f44a0a54356ad Mon Sep 17 00:00:00 2001 From: sunty <suntianyu0923@163.com> Date: 星期五, 02 八月 2019 14:16:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- controllers/fileController.go | 2 ++ controllers/task.go | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/controllers/fileController.go b/controllers/fileController.go index b3b4406..32e9cfc 100644 --- a/controllers/fileController.go +++ b/controllers/fileController.go @@ -180,6 +180,7 @@ Sex string `json:"sex"` TableId string `json:"tableId"` TableName string `json:"tableName"` + Enable int32 `json:"enable"` } type CompareSortResult []CompareResult @@ -235,6 +236,7 @@ PhoneNum: p.PhoneNum, Sex: p.Sex, TableId: p.TableId, + Enable: p.Enable, } dbTableInfos, _ := esApi.Dbtablefosbyid([]string{p.TableId}, config.EsInfo.EsIndex.DbTables.IndexName, esServerIp, esServerPort) if dbTableInfos !=nil{ diff --git a/controllers/task.go b/controllers/task.go index bc9392c..5e233ec 100644 --- a/controllers/task.go +++ b/controllers/task.go @@ -231,7 +231,7 @@ type TaskSdkRules struct { TaskId string `json:"taskId"` SdkId string `json:"sdkId"` - rules []TaskSdkRuleVo `json:"rules"` + Rules []TaskSdkRuleVo `json:"rules"` } type TaskSdkRuleVo struct { -- Gitblit v1.8.0