diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
index cd8f5cde8..751e62ad1 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -101,14 +101,14 @@ public class MemberService {
 		// 校验短信验证码 两种情况不能通过校验，1-验证码错误；2-超时 验证码10分钟有效
 		checkVerificationCode(dto);
 		String merchantId = "";
-		return memberRegisterAndLogin(dto.getMobileNumber(), merchantId, null);
+		return memberRegisterAndLogin(dto.getMobileNumber(), dto.getMerchantId(), dto.getOpenId());
 	}
 
 	/**
 	 * 公共登陆注册方法
 	 * @param phoneNumber 手机号
 	 * @param merchantId 商户id
-	 * @return
+	 * @return token返给前端
 	 */
 	private String memberRegisterAndLogin(String phoneNumber, String merchantId, String openId) {
 		if (StringUtils.isBlank(phoneNumber)) {
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
index 5f964495c..76cc6c6f2 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
@@ -158,7 +158,6 @@
             and merchant_id = #{merchantId,jdbcType=VARCHAR}
         </if>
         order by create_time DESC, update_time DESC
-        limit 1
     </select>
 
     <select id="selectInfoByMemberId" resultMap="MemberBasicInfoResult">