|
|
@@ -37,7 +37,7 @@ class GoodTax extends Model
|
|
|
$temp=[];
|
|
|
if($type==1){
|
|
|
$temp['spuCode']=$item->spuCode;
|
|
|
- $temp['cat_code']=$item->in_tax_merge;
|
|
|
+ $temp['cat_code']=$item->in_tax_code;
|
|
|
$temp['cat_name']=$item->in_tax_name;
|
|
|
$temp['short_name']=$item->in_tax_short;
|
|
|
$temp['merge_code']=$item->in_tax_merge;
|
|
|
@@ -45,7 +45,7 @@ class GoodTax extends Model
|
|
|
$temp['inv_good_name']=$item->inv_good_name;
|
|
|
}else{
|
|
|
$temp['spuCode']=$item->spuCode;
|
|
|
- $temp['cat_code']=$item->out_tax_merge??"";
|
|
|
+ $temp['cat_code']=$item->out_tax_code??"";
|
|
|
$temp['cat_name']=$item->out_tax_name??"";
|
|
|
$temp['short_name']=$item->out_tax_short??"";
|
|
|
$temp['merge_code']=$item->out_tax_merge;
|
