version 9/29
Merge branch 'FAT-yanggh-pl' of https://github.com/jufantec-team/zyjx into FAT-yanggh-pl

Conflicts:
	src/main/webapp/js/busi/ap/ap0001.js
	src/main/webapp/page/ap/ap0001.html
version 10/09 优化报名页面显示
添加客服记录及员工管理
添加管理介绍人
修复客服记录及员工管理的bug
添加学员信息查询
改用新的框架验证函数
添加顶替学员功能
Merge branch 'DEV-yunbo-work' of https://github.com/jufantec-team/zyjx into DEV-yunbo-work

Conflicts:
	src/main/java/com/soa/service/busi/ap/GetXmAp.java
	src/main/java/com/soa/service/busi/yg/CutListYg.java
	src/main/java/com/soa/service/busi/yg/ModZtYg.java
	src/main/webapp/WEB-INF/sql/ap.properties
	src/main/webapp/js/busi/ap/ap0003-add.js
	src/main/webapp/js/busi/welcome.js
	src/main/webapp/js/busi/xy/xy0001-detail.js
	src/main/webapp/js/busi/xy/xy0001.js
	src/main/webapp/page/xy/xy0001.html