Merge remote-tracking branch 'origin/master'

src/Common/Controller/CommonController.php

@@ -10,29 +10,13 @@ class CommonController
 {
 {
 
 
     /**
     /**
-     * 业务层-错误时响应
-     *
-     * @param integer $errorCode
-     * @param string $msg
-     * @param mixed $data
-     * @return array
-     */
-    public static function error(int $errorCode, string $msg, $data=null) {
-        return [
-            'errorCode' => $errorCode,
-            'msg' => $msg,
-            'data' => $data,
-        ];
-    }
-
-    /**
      * 业务层-正确时响应
      * 业务层-正确时响应
      *
      *
      * @param mixed $data
      * @param mixed $data
      * @param string $msg
      * @param string $msg
-     * @return void
+     * @return array
      */
      */
-    public static function success($data, string $msg='') {
+    public function success($data, string $msg='') {
         return [
         return [
             'data' => $data,
             'data' => $data,
             'msg' => $msg,
             'msg' => $msg,