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

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

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

@@ -278,7 +278,16 @@
      where wx_union_id=#{unionId} AND state = 0

      LIMIT 1

   </select>



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

      select

      <include refid="Base_Column_List" />

      from yeshi_ec_user

      where wx_open_id=#{wxOpenId} AND state = 0

      LIMIT 1

   </select>

	
   <select id="getMaxUid" resultType="java.lang.Long">select max(id) from

      yeshi_ec_user

   </select>