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

xuxiuxi

2019-03-14 2b1a3988c9fd35c39e3e43d0382d65a13c45efee

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -1015,9 +1015,11 @@

        if (count > 0) {
            for (auto rule:ruleMap) {
                if (rule.second.nIsRun == 1) {
                elem["nSdkTypes"].append(rule.second.nSdkType);
            }
        }
        }
//        Record_Cam_Sdk rec_sdk = db_c.searchCamSdkTableByCamId(iter->str_cam_dev_id);
//        elem["str_sdks"] = rec_sdk.str_sdks.toStdString();
//        elem["str_det_thr"] = rec_sdk.str_det_thr.toStdString();