jun  12-18  function update
Merge remote-tracking branch 'origin/junfei-startingWorking'
Merge branch 'master' of https://github.com/xitoujic/smsplatform

Conflicts:
	WebRoot/WEB-INF/classes/smsplatform/action/AdminAction.class
	WebRoot/WEB-INF/classes/smsplatform/service/AdminService.class
	WebRoot/sqlFile/前台功能请求.xlsx
	src/smsplatform/service/AdminService.java
zzx12181530
jun 12- 18 afternoon
master - 12-18
d
1