Merge branch 'master' of http://192.168.1.14:10010/r/webserver

liuxiaolong

2019-07-30 ea9204515558774fcb9e08364387c46136b03f9e

 controllers/taglist.go

@@ -37,8 +37,9 @@
      tokenRes["key"] = key
      tokenRes["title"] = value.(map[string]interface{})["tableName"].(string)
      tokenRes["value"] = value.(map[string]interface{})["id"].(string)
      tokenRes["status"] = value.(map[string]interface{})["isDelete"]
      if tokenRes["status"] == 1  {
      status := int(value.(map[string]interface{})["isDelete"].(float64))
      tokenRes["status"] = status
      if status == 1  {
         if GetTotalFromDb(key) == false{
            continue
         }