mobile login
mobile login
Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/entity/Yimiaoshenpiliucheng.java
	src/java/com/jskj/assets/server/entity/YimiaoshenpiliuchengExample.java
	src/java/com/jskj/assets/server/mapper/YimiaoshenpiliuchengMapper.xml
	web/sql脚本/YMGL数据库.sql