From 3fe28541b4c4d0ed35ff0d301367981729df4c9d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 02 八月 2019 17:43:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/fileController.go | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 4ca73fa..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{
@@ -264,6 +266,8 @@
PhoneNum: p.PhoneNum,
Sex: p.Sex,
TableId: p.TableId,
+ BwType: strconv.Itoa(int(p.BwType)),
+ TableName: p.TableName,
})
}
vpE := CompareResult{
--
Gitblit v1.8.0