Merge branch 'feature/验证云端是否存在接口' into develop

Conflicts:
	protected/class/actmeasure.php
	protected/controller/ClientController.php

protected/controller/ClientController.php

@@ -1124,16 +1124,6 @@ class ClientController extends DooController
         }
     }
 
-    function upfile($fildname, $param = 'doc, docx, xls, xlsx, png, zip') {
-        return $this->att->uploadMut($fildname, $param);
-    }
-
-    function upItemFile($fildname, $param = 'doc, docx, xls, xlsx, png, zip')
-    {
-        $this->att->setUploadDir();
-        return $this->att->uploadMut($fildname, $param);
-    }
-
     function getFileupErrorNo() {
         return $this->att->error();
     }