合并分支 'liuzhen' 到 'master'

订单图片生成调试



查看合并请求 !167

@@ -301,7 +301,7 @@ class OrderSalesmanController extends WeChatBaseController
     public function upload_img() {
         if($this->request->isAjax()) {
             set_time_limit(0);
-            ini_set('memory_limit', '512M');
+            ini_set('memory_limit', '2048M');
             ini_set("max_execution_time", 0);
             $img = $this->request->param('img');
             $top = $this->request->param('top');