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

app/admin/controller/Reorder.php

@@ -383,7 +383,7 @@ class Reorder extends \app\BaseController
                 return error_show(1004,"参数is_th不能为空");
             }
 
-            $return_wsm =isset($this->post['return_wsm'])&&$this->post['return_wsm']!=="" ? intval($this->post['return_wsm']):"";
+            $return_wsm =isset($this->post['return_wsm'])&&$this->post['return_wsm']!=="" ? trim($this->post['return_wsm']):"";
             if($return_wsm===""){
                 return error_show(1004,"参数return_wsm 不能为空");
             }