Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pans

2019-03-14 07fb2c16c75734d8c127585353249f529ea1262c

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -1015,7 +1015,9 @@

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