Merge branch 'master' of http://192.168.3.207:10080/qmx/jy-data-extract

src/github.com/dlclark/regexp2

@@ -1 +1 @@
-Subproject commit 7632a260cbaf5e7594fc1544a503456ecd0827f1
+Subproject commit 902a5ce7a7812e2ba9f73b9d96c09d5136df39cd

src/web/templates/admin/result_list.html

@@ -33,7 +33,6 @@
 						<th>采购单位</th>
 						<th>中标单位</th>
 						<th>招标机构</th>
-						<th>类型</th>
 						<th>操作</th> 
 		              </tr>
 		              </thead>
@@ -145,13 +144,6 @@ $(function () {
 			{ "data": "_id",render:function(val,a,row){
 				return "测试"
 			}},
-			{ "data": "toptype",render:function(val,a,row){
-				
-				if(val == undefined){
-					return "";
-				}
-				return val
-			}},
 			{ "data": "_id",render:function(val,a,row){
 				rowdata[val]= row;
 				return  "<a class='btn btn-primary' onclick='trackShow(\""+val+"\")'>详细</a>"