From a4973970de6346f1e46e119cffd87b55dd87125f Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Thu, 15 Jun 2023 10:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cweb/src/main/java/com/cweb/controller/BsMerController.java     | 2 ++
 .../src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java   | 2 ++
 2 files changed, 4 insertions(+)

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());