From 3566c2630dc2ac33e03fb6df5ec2cd19e1625a68 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 27 九月 2019 15:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver

---
 controllers/dbtablesCon.go |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index 40c52dc..760fcc9 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -45,12 +45,17 @@
 // @Accept  x-www-form-urlencoded
 // @Produce json
 // @Tags dbtable
+// @Param isDelete query string true "0锛氭煡鏈垹闄わ紝1锛氭煡宸插垹闄わ紝鍏朵粬锛氭煡鎵�鏈�"
 // @Success 200 {string} json "{"code":200, msg:"", success:true}"
 // @Failure 500 {string} json "{"code":500, msg:"", success:false}"
 // @Router /data/api-v/dbtable/findAllDbTablesByCurServer [GET]
 func (dbt DbTableController) FindAllDbTablesByCurServer(c *gin.Context) {
 	var api dbapi.DbTableApi
-	arr,e := api.FindAllDbTablesByCurServer()
+	isDeleteStr := c.Query("isDelete")
+	if isDeleteStr == "" {
+		isDeleteStr = "0"
+	}
+	arr,e := api.FindAllDbTablesByCurServer(isDeleteStr)
 	if e == nil {
 		util.ResponseFormat(c,code.Success, arr)
 	} else {

--
Gitblit v1.8.0