diff --git a/cweb/src/main/java/com/cweb/controller/BsMerController.java b/cweb/src/main/java/com/cweb/controller/BsMerController.java index ba5dadc..65a1c28 100644 --- a/cweb/src/main/java/com/cweb/controller/BsMerController.java +++ b/cweb/src/main/java/com/cweb/controller/BsMerController.java @@ -457,6 +457,8 @@ public class BsMerController { storeModel.setAgentName(mer.getAgentName()); storeModel.setSalesmanId(mer.getSalesmanId()); storeModel.setSalesmanName(mer.getSalesmanName()); + storeModel.setMerId(mer.getId()); + storeModel.setMerName(mer.getMerName()); storeModel.setStoreType(mer.getMerType()); storeModel.setStatus(StoreStatusEnum.status3.getNumber()); storeModel.setBlisUrl(mer.getBlisUrl()); diff --git a/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java index 65722c1..610ad09 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java @@ -110,7 +110,9 @@ public class BsMerServiceImpl implements BsMerService { mer.setCompanyId(salesman.getCompanyId()); mer.setCompanyName(salesman.getCompanyName()); mer.setAgentId(salesman.getAgentId()); + mer.setAgentName(salesman.getAgentName()); mer.setSalesmanId(salesman.getId()); + mer.setSalesmanName(salesman.getName()); mer.setRegName(merAccount.getName()); mer.setRegPhone(merAccount.getPhone()); mer.setRegEmail(merAccount.getEmail());