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 ++
1 files changed, 2 insertions(+), 0 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{
--
Gitblit v1.8.0