commit
优化摘要备注字数提示
commit;
commit;
Merge branch 'master' of https://github.com/pangdodo/PAMS

Conflicts:
	deploy/pams/WebContent/WEB-INF/applicationContext.xml
	deploy/pams_gxgl_kpi/com/pams/gxgl/kpi/jsl/view/tab_jsl_bm.ftl
	deploy/pams_gxgl_kpi/com/pams/gxgl/kpi/jsl/view/tab_jsl_gs.ftl
	deploy/pams_gxgl_kpi/com/pams/gxgl/kpi/jsl/view/tab_jsl_ry.ftl