diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ModifyPasswordDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ModifyPasswordDTO.java
index fac8459ef..f48c1a189 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ModifyPasswordDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ModifyPasswordDTO.java
@@ -20,7 +20,7 @@ public class ModifyPasswordDTO {
     @ApiModelProperty(value = "密码",required = true)
     String password;
     @ApiModelProperty(value = "第二密码",required = true)
-    String passwordSecondary;
+    String secondaryPassword;
     @ApiModelProperty(value = "门店ID",required = true)
     Long shopId;
     @ApiModelProperty(value = "门店ID",hidden = true)
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 a16407d2e..e950c0d56 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
@@ -12,6 +12,7 @@ import com.cool.store.mapper.LineAuditInfoMapper;
 import com.cool.store.mapper.LineInfoMapper;
 import com.cool.store.request.JoinIntentionRequest;
 import com.cool.store.service.JoinIntentionService;
+import com.cool.store.service.ThirdXinGuanJiaService;
 import com.cool.store.service.UserAuthMappingService;
 import com.cool.store.utils.PasswordUtil;
 import com.cool.store.utils.RedisUtilPool;
@@ -63,6 +64,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
     CommonService commonService;
     @Resource
     HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
+    @Resource
+    ThirdXinGuanJiaService thirdXinGuanJiaService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -131,6 +134,9 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
         String password = PasswordUtil.encryptPassword(substring, salt);
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(lineInfo.getPartnerId());
         hyPartnerUserInfoDO.setDownstreamSystemPassword(password);
+
+
+
         hyPartnerUserInfoDO.setDownstreamSystemSalting(salt);
         hyPartnerUserInfoDO.setUpdateTime(new Date());
         hyPartnerUserInfoDAO.updatePasswordByPartnerId(hyPartnerUserInfoDO);
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java
index 1f600384f..73dd7c9ad 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java
@@ -94,7 +94,7 @@ public class ShopAccountServiceImpl implements ShopAccountService {
         }
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(shopInfo.getPartnerId());
         hyPartnerUserInfoDO.setDownstreamSystemPassword(modifyPasswordDTO.getPassword());
-        hyPartnerUserInfoDO.setDownstreamSystemSecondaryPassword(modifyPasswordDTO.getPasswordSecondary());
+        hyPartnerUserInfoDO.setDownstreamSystemSecondaryPassword(modifyPasswordDTO.getSecondaryPassword());
         hyPartnerUserInfoDO.setDownstreamSystemSalting(modifyPasswordDTO.getPasswordSalt());
         hyPartnerUserInfoDO.setUpdateTime(new Date());
         hyPartnerUserInfoDAO.updatePasswordByPartnerId(hyPartnerUserInfoDO);
@@ -102,7 +102,7 @@ public class ShopAccountServiceImpl implements ShopAccountService {
         List<Long> shopIdList = shopInfoDAO.getShopIdList(shopInfo.getLineId());
 
         //批量修改密码 密码盐
-        shopAccountDAO.batchUpdatePasswordByShopIds(shopIdList,modifyPasswordDTO.getPassword(),modifyPasswordDTO.getPasswordSecondary(),modifyPasswordDTO.getPasswordSalt(),new Date());
+        shopAccountDAO.batchUpdatePasswordByShopIds(shopIdList,modifyPasswordDTO.getPassword(),modifyPasswordDTO.getSecondaryPassword(),modifyPasswordDTO.getPasswordSalt(),new Date());
 
         //当前加盟商所有开店成功的CODE
         List<String> shopCodeList = shopInfoDAO.getShopCodeList(shopInfo.getLineId());