Merge remote-tracking branch 'origin/master' into akun

刘锟
app/Http/Controllers/Bside/Product/ProductController.php
--- a/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @3a7ba89
+++ b/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @3a7ba89
@@ -331,7 +331,7 @@ class ProductController extends BaseController
         }else{
             $v['values'] = $info['values'];
         }
-         return $this->success($v);
+         return $v;
     }
 
     /**