Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -47,12 +47,8 @@ class ProductLogic extends  BaseLogic
         $this->param = $this->handleSaveParam($this->param);
         $this->param = $this->handleSaveParam($this->param);
         try {
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
-                $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
-                if($is_upgrade == 0 || $six_read == 1){
                 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
                 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
                 $route = $this->param['route'];
                 $route = $this->param['route'];
-                }
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $id = $this->param['id'];
                 $id = $this->param['id'];
             }else{
             }else{