Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

doc/Mind/ElectiveGeneration.cs

@@ -462,7 +462,7 @@ namespace mxdemo.Mind
         /// <param name="queryCode"></param> 按列
         /// <param name="active">前端激活的步骤</param>
         /// <returns></returns>
-        ElectiveGenerationDetailWrapper getElectiveGenerationDetails(int pageNo, int pageSize, int roundId, int generation, int groupId, string queryCode, int active);
+        ElectiveGenerationDetailWrapper getElectiveGenerationDetails(int pageNum, int pageSize, int roundId, int generation, int groupId, string queryCode, int active);
 
         #endregion
 
@@ -547,5 +547,13 @@ namespace mxdemo.Mind
 
         #region 排名均衡(略）先完成前面的
         #endregion
+
+        #region
+        /// <summary>
+        /// 重用getElectiveGenerationDetails, query=active=current
+        /// <param name="keywords">姓名/学号/账号</param>
+        /// </summary>
+        ElectiveGenerationDetailWrapper[] searchElectiveGenerationDetails(int pageNum, int pageSize, int roundId, string keywords);
+        #endregion
     }
 }