Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-06 6c8f1689d545a6384046b79558e06ba32ec5dacf

Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

# Conflicts:
#	QiaoJiaSystem/DataManagerServer/http_configserver.cpp
dev_cam

 QiaoJiaSystem/DataManagerServer/CMakeLists.txt

@@ -154,7 +154,7 @@
    HCCore
    hcnetsdk
    pthread
#    mysqlpp
    mysqlpp
    )

#add_executable(Apptest

 QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h

@@ -39,11 +39,11 @@
        rec.setGenerated("id", false);

        pModel.insertRecord(-1, rec);//TODO

        m_db->transaction();//开始事务操作

        auto id1 = pModel.query().lastInsertId();
        if (pModel.submitAll()) {
            m_db->commit();//提交
            responseJsonValue["id"] = pModel.query().lastInsertId().toString().toStdString();
            responseJsonValue["success"] = "true";
            responseJsonValue["message"] = "添加成功！";
        } else {

 QiaoJiaSystem/build/config.db

Binary files differ