Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-api

pbl.js

@@ -1501,6 +1501,15 @@ router.route("/selectSnameByCid").all((req, res, next) => {
     var json = queryString(req.url);
     getmysql(req, res, "selectSnameByCid", json["cid"]);
 });
+
+//批量上传查询学生
+router.route("/selectSnameByCidAndOid").all((req, res, next) => {
+	var json = queryString(req.url);
+	getmysql(req, res, "selectSnameByCidAndOid", json["cid"],json["oid"]);
+});
+
+
+
 //批量上传查询学生分页
 router.route("/selectSnameByCidPage").all((req, res, next) => {
     var json = queryString(req.url);