tt

application/admin/controller/Report.php

@@ -266,7 +266,7 @@ class Report extends Base
         );
     }
 
-<<<<<<< HEAD
+
     // 工作报表
     public function workreport()
     {
@@ -371,7 +371,5 @@ class Report extends Base
 
         return $this->fetch();
     }
-=======
->>>>>>> 725c05a5865a7a7fa45b0171f80d65c46633c315
 
 }//end class