派生自 development/c++
parent: d979bf53 | 补丁 | 提交 | ignore whitespace
xuxiuxi
2019-03-15 cdfb8eb2a956d25d688033be735f4741b2ab58bd 
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
add if is_run to sdk_type for find local camera list
1个文件已修改
2 ■■■■■ 已修改文件
QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp


@@ -501,7 +501,7 @@


    std::list<Record_Cam_Dev> lst;


    QSqlTableModel pModel(NULL, m_db);


    pModel.setTable("cam_dev");


    pModel.setFilter(QObject::tr("cam_dev_id != '' and cam_dev_id is not null and type='0'"));


    pModel.setFilter(QObject::tr("cam_dev_id != '' and cam_dev_id is not null "));


    pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange


    pModel.select();