----
注册
Merge branch 'master' of
https://github.com/caining618/ytf_phone_server.git

Conflicts:
	src/main/java/com/yeepay/ytf/server/invitemember/dao/MchtUserDao.java
	src/main/java/com/yeepay/ytf/server/invitemember/dao/impl/MchtUserDaoImpl.java
	src/main/java/com/yeepay/ytf/server/user/dao/IndivUserDao.java
	src/main/java/com/yeepay/ytf/server/user/dao/UserDao.java
	src/main/java/com/yeepay/ytf/server/user/dao/impl/IndivUserDaoImpl.java
	src/main/java/com/yeepay/ytf/server/user/dao/impl/UserDaoImpl.java
	src/main/resources/com/yeepay/ytf/mybatis/mapper/ytf-mchtUser.xml
	src/main/resources/com/yeepay/ytf/mybatis/mapper/ytf-user.xml