合并分支 'master-server' 到 'master'

Master server



查看合并请求 !1007

@@ -122,6 +122,8 @@ class ProductLogic extends  BaseLogic
                     }
                     if(isset($val['column_id']) && $val['column_id'] == 1){
                         $column_id = 1;
+                        $columnModel = new Column();
+                        $column_id = $columnModel->edit(['column_name'=>$val['column_name']],['id'=>$column_id]);
                     }else{
                         $columnId = $this->getColumnId($product_id,$val['column_name']);
                         $column_id = $columnId['column_id'];