Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 30cac258 4af298c8
Showing 1 changed file with 2 additions and 2 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
@@ -585,8 +585,8 @@ public class CustomerBizService extends AbstractCustomerService {
             return null;
         }
         CarArchiveVO.DealerItem vo = CarArchiveVO.createDealerItem();
-        vo.setId(shop.getId());
-        vo.setName(shop.getShortName());
+        vo.setId(shop.getDealerId());
+        vo.setName(shop.getDealerName());
         vo.setLogo(shop.getShopLogo());
         vo.setPhone(shop.getTel());
         vo.setAddr(shop.getAddr());