修改信息

core/CoreApp/controllers/Systemfout.php

@@ -3453,7 +3453,7 @@ class Systemfout extends Start_Controller {
 					$info_listxw[$key]['librarytime'] = '<em class="t">'.date('Y-m-d H:i:s',$value['librarytime']).'</em>';
 				}
             }
-			$info_listsmt = $this->fullordersmt->find_all($where." and mergeid = '0'",'id,shop,type,orderinfo,number,waybill,express,print,library,librarytime,orderremarks',$order_str,$start,$perpage);
+			$info_listsmt = $this->fullordersmt->find_all($where,'id,shop,type,orderinfo,number,waybill,express,print,library,librarytime,orderremarks',$order_str,$start,$perpage);
 			 //格式化数据
             foreach ($info_listsmt as $key=>$value) 
 		    {