合并分支 'akun' 到 'master'

update



查看合并请求 !1039

@@ -1072,8 +1072,8 @@ class ProductLogic extends  BaseLogic
                     $cModel = new Column();
                     $cModel = new Column();
                     $c_id = $cModel->addReturnId(['column_name'=>$describe_value['title'],'product_id'=>$id]);
                     $c_id = $cModel->addReturnId(['column_name'=>$describe_value['title'],'product_id'=>$id]);
                     $dataS = [
                     $dataS = [
-                        'product_id'=>$c_id,
-                        'column_id'=>$id,
+                        'product_id'=>$id,
+                        'column_id'=>$c_id,
                         'text_type'=>1,
                         'text_type'=>1,
                         'title'=>$describe_value['title'] ?? '',
                         'title'=>$describe_value['title'] ?? '',
                         'sort'=>$describe_key + 1,
                         'sort'=>$describe_key + 1,