Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h

@@ -321,6 +321,8 @@
            Json::Value typeJsonValue = requestJsonValue[CamDev_type];
            if (typeJsonValue.type() != Json::ValueType::nullValue) {
                camDevBuilder.addtype((typeJsonValue.asString()));
            } else {
                camDevBuilder.addtype("1");
            }
            responseJsonValue["message"] = "查询成功！";
            responseJsonValue["success"] = "true";
@@ -402,6 +404,8 @@
            Json::Value typeJsonValue = requestJsonValue[CamDev_type];
            if (typeJsonValue.type() != Json::ValueType::nullValue) {
                camDevBuilder.addtype((typeJsonValue.asString()));
            } else {
                camDevBuilder.addtype("1");
            }
            responseJsonValue["message"] = "查询成功！";
            responseJsonValue["success"] = "true";