修改合并

Signed-off-by: luffy <lyhjob0514@gmail.com>
Merge branch 'master' of https://github.com/tvb-stan/cft-commons-pms.git

Conflicts:
	src/main/webapp/static/commons/api.jsp
sina js 文件

Signed-off-by: luffy <lyhjob0514@gmail.com>
Merge branch 'master' of https://github.com/tvb-stan/cft-commons-pms.git

Conflicts:
	src/main/webapp/static/commons/api.jsp