Merge branch 'develop' of http://code.dev.soooner.com:18000/wuxiande/SooonerHotel into develop

SooonerHotel/App/Lib/Action/Api/WasuAction.class.php

@@ -70,7 +70,9 @@ class WasuAction extends Action
         }
         $program = urldecode($_GET["program"]);
         if (!empty($program)&& $program!="all" && $program!=""){
-            $where.=" AND mw.programType='$program' ";
+//            $where.=" AND mw.programType='$program' ";
+            $programs = str_replace("|","','",$program);
+            $where.=" AND mw.programType in ('$programs') ";
         }
 
         if (empty($size)){

SooonerHotel/App/Tpl/Inject/zh-cn/InjectLog/index.html

@@ -76,7 +76,7 @@ onRowContextMenu : onRowContextMenu
             <th data-options="field:'sp_name',width:30" sortable="true">合作方名称</th>
 			<th data-options="field:'addtime',width:30" sortable="true">创建时间</th>
             <th data-options="field:'updatetime',width:30" sortable="true">更新时间</th>
-			<th data-options="field:'status'" sortable="true" align="center">状态</th>
+			<!--<th data-options="field:'status'" sortable="true" align="center">状态</th>-->
 			<!--<th field="action" align="center" formatter="InputAction">操作</th>-->
 		</tr>
 	</thead>