Merge branch 'wugg' of wugg/phpstock into version1.5

app/admin/controller/After.php

@@ -834,7 +834,7 @@ class After extends \app\BaseController
                         "good_name"=>$info["good_name"],
                         "return_wsm"=>$returninfo["return_wsm"],
                         "defective_wsm"=>'',
-                        "return_msg"=>$out["error_msg"],
+                        "return_msg"=>$info["error_msg"],
                         "return_num"=>$info["total_num"],
                         "normal_num"=>0,
                         "received_num"=>0,