API-商品列表-如果养老金单独设置开关开启，则养老金采用系统单独设置的值pension

app/common/repositories/store/product/ProductRepository.php

@@ -53,7 +53,7 @@ class ProductRepository extends BaseRepository
 {
 
     protected $dao;
-    protected $filed = 'is_status,concession_pri,product_id,mer_id,brand_id,unit_name,rate,reply_count,store_info,cate_id,ficti,image,slider_image,store_name,keyword,sort,is_show,sales,price,refusal,cost,ot_price,stock,is_gift_bag,care_count,status,is_used,create_time,seckill,plate_mer_profit,type,icon_type';
+    protected $filed = 'is_status,concession_pri,product_id,mer_id,brand_id,unit_name,rate,reply_count,store_info,cate_id,ficti,image,slider_image,store_name,keyword,sort,is_show,sales,price,refusal,cost,ot_price,stock,is_gift_bag,care_count,status,is_used,create_time,seckill,plate_mer_profit,type,icon_type,pension_is,pension';
 
     /**
      * ProductRepository constructor.

app/common/repositories/system/merchant/MerchantRepository.php

@@ -520,6 +520,9 @@ class MerchantRepository extends BaseRepository
                 $v['pv'] = $pv;
             }
 
+            if ($v['pension_is'] != 0) {
+                $v['yanglao'] = $v['pension'];
+            }
 //            $v=($v,$k);
 //            array_push($v,$k);
             $arr[]=$v;