From 30d0bd43f53740554e8387fcd14bfab689eeca9c Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 25 一月 2019 21:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2_布控feature' into ywv1.2_布控feature
---
QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
index 2461bfd..4dbacb0 100644
--- a/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
+++ b/QiaoJiaSystem/LocalDBTool/SqliteToolkit.hpp
@@ -108,8 +108,8 @@
std::string getTableInfosSql() {
//uuid,tableName,tableDesc,tableType,bwType,startTime,endTime
std::string sql =
- "select uuid,tableName,tableType,bwType,startTime,endTime,uploadFlag,cmpThreshold,enabled from '" +
- g_tableName + "' where del_flag = 0";
+ "select uuid,tableName,tableType,bwType,startTime,endTime,uploadFlag,cmpThreshold,enabled,create_by from " +
+ g_tableName + " where del_flag = 0";
return sql;
}
@@ -241,7 +241,8 @@
sql.append("create_time BLOB DEFAULT (datetime('now', 'localtime')),");
sql.append("update_time DATETIME DEFAULT NULL,");
sql.append("create_by varchar(255) DEFAULT NULL,");
- sql.append("del_flag INTEGER DEFAULT 0");
+ sql.append("del_flag INTEGER DEFAULT 0,");
+ sql.append(" enabled varchar(255) DEFAULT 1");
sql.append(");");
// 浜鸿劯鐗瑰緛琛�
sql.append("CREATE TABLE " + g_dbName + ".'");
--
Gitblit v1.8.0