Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-20 28cd97d04c68bd8c5fd4adf7780200f61da13654

 fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml

@@ -250,7 +250,8 @@
      from yeshi_ec_user where appid=#{appId} and identifycode=#{openId}

   </select>

   <!-- 根据AppId与电话号码获取用户 -->

   <select id="listByAppIdAndPhone" resultMap="BaseResultMap">

   <select id="listByAppIdAndPhone" resultMap="BaseResultMap"

      useCache="false" flushCache="true">

      select

      <include refid="Base_Column_List" />

      from yeshi_ec_user where appid=#{appId} and phone=#{phone}