Merge branch 'master' of 192.168.0.222:bc-framework into lbj_form

Conflicts:
	pom.xml
Merge branch 'master' of 192.168.0.222:bc-framework into lbj_form
Merge branch 'form' of 192.168.0.222:bc-framework into lbj_form
Merge branch 'form' of 192.168.0.222:bc-framework into lbj_form
Merge branch 'form' of 192.168.0.222:bc-framework into lbj_form
Merge branch 'master' of 192.168.0.222:bc-framework into lbj_form
Merge branch 'form' of 192.168.0.222:bc-framework into lbj_form
Merge branch 'form' of 192.168.0.222:bc-framework into lbj_form
Merge branch 'master' of 192.168.0.222:bc-framework into lbj_form
图片合并功能实现
Merge branch 'master' of 192.168.0.222:bc-framework into lbj_form

Conflicts:
	pom.xml
Merge branch 'master' of 192.168.0.222:bc-framework into lbj_form
jdbc增加对order by的处理
增加数字格式化为中文的金钱格式方法
改进浏览器的下载操作
简化籍贯模块的设计，并实现乡级、村级的数据处理
修正司机招聘模块根据身份证号获取籍贯信息的错误
Merge branch 'form'
Merge branch 'master' of 192.168.0.222:bc-framework into pmc
增加自定义表单模块service接口