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

@@ -154,6 +154,9 @@ class ProductLogic extends  BaseLogic
         }else{
         }else{
             $this->param['thumb'] = Arr::a2s([]);
             $this->param['thumb'] = Arr::a2s([]);
         }
         }
+        if(isset($this->param['route']) && !empty($this->param['route'])){
+            $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
+        }
         $this->model->edit($this->param,['id'=>$this->param['id']]);
         $this->model->edit($this->param,['id'=>$this->param['id']]);
         return $this->success();
         return $this->success();
     }
     }