bug

src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

@@ -105,7 +105,8 @@ public class MerchantServiceImpl implements IMerchantService {
 
         if(StringUtils.isEmpty(dto.getMerchant_id())){
             if(searchBack != null){
-                return VaultsResponse.failed("手机号码已被注册");
+                dto.setMerchant_id(searchBack.getMerchant_id());
+                //return VaultsResponse.failed("手机号码已被注册");
             }
             //添加商户
             VaultsResponse<String> createVault = this.merchantCreate(dto);