Merge branch 'feature/附件功能完善' into develop

# Conflicts:
#	protected/config/routes.conf.php
#	protected/config/ver.conf.php
#	protected/controller/ClientController.php
#	protected/module/admin/model/aconfig.php

protected/controller/ClientController.php

@@ -14,13 +14,9 @@ Doo::loadClass('numofperact');
 Doo::loadClass('measureauditact');
 Doo::loadClass('itemfile');
 Doo::loadModel('users');
-<<<<<<< HEAD
-Doo::loadModelAt('aconfig', 'admin');
-=======
 Doo::loadClass('itemmeasurenum');
 Doo::loadModelAt('aconfig', 'admin');
 Doo::loadClass('sms');
->>>>>>> feature/附件功能完善
 
 /**
  * MainController
@@ -31,11 +27,8 @@ Doo::loadClass('sms');
 class ClientController extends DooController
 {
 
-<<<<<<< HEAD
-    private $data, $client, $auth, $att, $file, $zip, $actmeasure, $contractact, $project, $profile, $numofperact, $measureauditact, $attfile, $users, $itemfile, $modelconfig;
-=======
-    private $data, $client, $auth, $att, $file, $zip, $actmeasure, $contractact, $project, $profile, $numofperact, $measureauditact, $attfile, $users, $itemfile, $aconfig, $sms, $itemMeasureNum;
->>>>>>> feature/附件功能完善
+    private $data, $client, $auth, $att, $file, $zip, $actmeasure, $contractact, $project, $profile, $numofperact, $measureauditact, $attfile, $users, $itemfile, $modelconfig, $aconfig, $sms, $itemMeasureNum;
+
     private $statusArray = array('uncheck' => '1', 'checking' => '2', 'checked' => '3', 'checkno' => '4');
     private $fileTypeArray = array('台帐附件');
 
@@ -55,13 +48,10 @@ class ClientController extends DooController
         $this->measureauditact = new MeasureauditAct();
         $this->users = new Users();
         $this->itemfile = new ItemFile();
-<<<<<<< HEAD
         $this->modelconfig = new AConfig();
-=======
         $this->itemMeasureNum = new ItemMeasureNumpofper();
         $this->aconfig = new AConfig();
         $this->sms = new Sms(Doo::conf()->SMS_URL, Doo::conf()->SMS_AUTHKEY);
->>>>>>> feature/附件功能完善
     }
 
     public function ClientSignin()
@@ -710,7 +700,9 @@ class ClientController extends DooController
         foreach ($temp as $k => $v) {
             $array = explode(",", $v); //再将拆开的数组重新组装
             foreach ($array as $i => $t) {
-                $temp2[$k] = !empty($temp2[$k]) ? array_merge($temp2[$k], array("{$key[$i]}" => $t)) : array("{$key[$i]}" => $t); //依次添加到新的数组中去
+                $temp2[$k] = !empty($temp2[$k]) ? array_merge($temp2[$k], array("{
+        $key[$i]}" => $t)) : array("{
+        $key[$i]}" => $t); //依次添加到新的数组中去
             }
         }
         return $temp2;