1

protected/class/receipt.func.php

@@ -1733,7 +1733,7 @@ function excelRCData($summaryData,$cellCount,$year){
 		
 		//合并收入单元格
 		if($colNum>1||$colNum>=7){
-			$obj->getActiveSheet()->mergeCells($col.'1:'.$col.'2');
+			//$obj->getActiveSheet()->mergeCells($col.'1:'.$col.'2');
 		}
 		
 		$colNum++;
@@ -1753,8 +1753,8 @@ function excelRCData($summaryData,$cellCount,$year){
 	
 	//设置合并单元格
 	$obj->getActiveSheet()->mergeCells('A1:A3');
-	$obj->getActiveSheet()->mergeCells('B1:G1');
-	$obj->getActiveSheet()->mergeCells('B2:G2');
+	$obj->getActiveSheet()->mergeCells('B1:G2');
+	//$obj->getActiveSheet()->mergeCells('B2:G2');
 	
 // 	echo (int)($cellCount/26).'</br>';
 // 	echo ($cellCount%26).'</br>';