Merge branch 'master' of http://smartcost.in.8866.org:26903/caipin/cld

Conflicts:
	protected/model/accountItem.php

protected/controller/ReceiptExtendController.php

@@ -2705,7 +2705,7 @@ class ReceiptExtendController extends DooController {
     		
     		//构建栏目展示Html
     		$sectionHtml='';
-    		foreach ($aiAllList as $key=>$value){
+    		foreach ($aiAllList as $key=>$value){ 
     			$sectionHtml.='<th colspan="'.count($value[$key]).'">'.$key.'</th>';
     		}
     		

protected/model/accountItem.php

@@ -27,7 +27,11 @@ class accountItem extends DooModel {
 	 * 
 	 */
 	function getAccountItem(){
+<<<<<<< HEAD
 		$sql = 'select category
+=======
+		$sql = 'select category, count(*) as itemCount
+>>>>>>> 74b60f9f1fb09be40f942fc394c787fb1a0f21cb
 				from ' . $this->_table . '
 						 GROUP BY category ORDER BY  aid ASC  ';
 		$query = Doo::db ()->query ( $sql );