Merge remote-tracking branch 'origin/div' into div

admin

2019-12-18 84ab5704aee0df06d0352ab67d1fa671ac284c8b

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java

@@ -59,6 +59,9 @@


   // 根据获WXUnionId有效用户

   UserInfo getEffectiveUserInfoByWXUnionId(@Param("unionId") String unionId);

	
   //根据微信openid查询

   UserInfo getEffectiveUserInfoByWXOpenId(@Param("wxOpenId") String wxOpenId);



   Long getMaxUid();