diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java
index dca04c48c..23e851ec2 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java
@@ -26,7 +26,4 @@ public class AuditPassRequest {
     @ApiModelProperty("通过原因")
     private String passReason;
 
-    @ApiModelProperty("战区regionId,只在意向加盟申请阶段使用")
-    private Long fightRegion;
-
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
index c6cb3dc1a..55bead3c1 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
@@ -142,9 +142,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
         updateLine.setId(lineInfo.getId());
         updateLine.setWorkflowStage(WorkflowStageEnum.STORE.getCode());
         updateLine.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode());
-        EnterpriseUserDO enterpriseUser = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SELECT_SITE_COMMISSIONER, lineInfo.getWantShopAreaId());
-        String developmentManager = Optional.ofNullable(enterpriseUser).map(EnterpriseUserDO::getUserId).orElse(null);
-        updateLine.setDevelopmentManager(developmentManager);
+        updateLine.setDevelopmentManager(lineInfo.getInvestmentManager());
         updateLine.setUpdateUserId(userId);
         lineInfoDAO.updateLineInfo(updateLine);
         //初始化店铺
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
index 5d9ba0467..c40a5458e 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
@@ -77,13 +77,13 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
         lineInfoParam.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode());
         lineInfoParam.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_5.getCode());
         if ((Objects.nonNull(request.getAreaCode()) && Objects.nonNull(lineInfoDO) && StringUtils.isBlank(lineInfoDO.getInvestmentManager())) || (Objects.isNull(lineInfoDO))) {
-            EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, Long.valueOf(request.getAreaCode()));
+            EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, Long.valueOf(request.getAreaCode()));
             lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId());
         }
         lineInfoParam.setLineStatus(1);
         if (lineInfoParam.getWantShopAreaId() != null) {
             Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId());
-            lineInfoParam.setBigRegionId(regionId);
+            lineInfoParam.setRegionId(regionId);
         }
         lineInfoDAO.insertOrUpdate(lineInfoParam);
         QualificationsInfoDO qualificationsInfoDO = request.toQualificationsInfoDO();
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java
index 5f10f94c2..234cc9e4e 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineFlowService.java
@@ -48,9 +48,6 @@ public abstract class LineFlowService {
         if(!lineInfo.getWorkflowSubStage().equals(request.getWorkflowSubStage())){
             throw new ServiceException(ErrorCodeEnum.WORK_FLOW_STAGE_PASS_ERROR);
         }
-        if (WorkflowSubStageEnum.INTEND.getCode().equals(lineInfo.getWorkflowSubStage())){
-            lineInfo.setRegionId(request.getFightRegion());
-        }
         String partnerId = lineInfo.getPartnerId();
         LineAuditInfoDO auditInfo = new LineAuditInfoDO();
         auditInfo.setLineId(request.getLineId());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
index 9e79f47d1..692b497ca 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
@@ -102,14 +102,11 @@ public class LineServiceImpl implements LineService {
             result.setInvestmentManagerName(user.getName());
             result.setInvestmentManagerMobile(user.getMobile());
         }
-        result.setBigRegionId(lineInfo.getBigRegionId());
         if(lineInfo.getRegionId() != null && lineInfo.getRegionId() != 0){
             Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(lineInfo.getWantShopAreaId());
             Map<Long, String> regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, lineInfo.getRegionId()));
             result.setRegionId(lineInfo.getRegionId());
             result.setRegionName(regionNameMap.get(lineInfo.getRegionId()));
-            result.setLargeRegionId(bigRegionIdByAreaId);
-            result.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId));
         }
         LineAuditInfoDO lineAuditInfoDO = lineAuditInfoDAO.getAuditInfoByLineId(lineInfo.getId());
         if (lineAuditInfoDO!=null){
@@ -416,7 +413,8 @@ public class LineServiceImpl implements LineService {
         if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){
             userId = addLineRequest.getInvestmentManagerUserId();
         }else {
-            EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, addLineRequest.getWantShopAreaId());
+            //督导角色是招商专员
+            EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, addLineRequest.getWantShopAreaId());
             userId = user.getUserId();
         }
         Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
index 719d55d2c..b36c9ee8a 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
@@ -988,12 +988,12 @@ public class PointServiceImpl implements PointService {
             requestMap.put("partnerMobile",lineInfo.getMobile());
             requestMap.put("lineId",String.valueOf(lineInfo.getId()));
             requestMap.put("shopId",String.valueOf(shopId));
-            if (Objects.nonNull(shopInfo.getShopName())) {
-                requestMap.put("storeName",shopInfo.getShopName());
-                commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
-            }else {
-                commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap);
-            }
+//            if (Objects.nonNull(shopInfo.getShopName())) {
+//                requestMap.put("storeName",shopInfo.getShopName());
+//                commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
+//            }else {
+//                commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap);
+//            }
         }
         return shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId);
     }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index 7b0a2a7d7..a7cae8201 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -70,8 +70,7 @@ public class ShopServiceImpl implements ShopService {
             shopInfo.setPartnerId(lineInfo.getPartnerId());
             //初始化
             shopInfo.setStoreNum(RandomEightCharCodeUtils.getCode());
-            EnterpriseUserDO supervisor = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfo.getRegionId());
-            shopInfo.setSupervisorUserId((Objects.isNull(supervisor)||supervisor.getUserId()==null)?lineInfo.getInvestmentManager():supervisor.getUserId());
+            shopInfo.setSupervisorUserId(lineInfo.getInvestmentManager());
             shopInfo.setShopName("店铺" + NumberConverter.convertArabicToChinese(i + 1));
             addShopList.add(shopInfo);
         }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
index 28c83a305..0d442bda9 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
@@ -225,8 +225,8 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
 
     private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) {
         String defaultJobnumber = getDefaultJobnumber(userRoleEnum);
-        // 如果找不到招商专员，则分配给默认的招商经理
-        if (UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)) {
+        // 如果找不到督导，则分配给默认的督导
+        if (UserRoleEnum.SUPERVISION.equals(userRoleEnum)) {
             EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(defaultJobnumber);
             if (defaultUser == null) {
                 defaultUser = enterpriseUserDAO.getUserInfoById(defaultJobnumber);