经济合同每月基准承包款生成规则改进
修正经济合同每月基准承包款生成规则改进
收费明细预交承包款和维修费增加格式化
修正经济合同入库时的提示条件
Merge branch 'master' of 192.168.0.222:bc-business

Conflicts:
	bc-business-contract/src/main/java/cn/bc/business/contract/service/Contract4ChargerServiceImpl.java
Merge branch 'master' into zxr
过户，重发包，续约操作不再自动添加附件
获取经济合同对应车辆的司机信息逻辑修改
Merge branch 'master' of 192.168.0.222:bc-business
增加生成的收费通知计费开始日为合同期限开始日加一天功能
Merge branch 'master' of 192.168.0.222:bc-business into lbj

Conflicts:
	bc-business-contract/src/main/java/cn/bc/business/contract/service/Contract4ChargerServiceImpl.java
增加对维修费的特殊处理
劳动合同保存时不再更新司机的籍贯信息
Merge branch 'bryanthe'
修正编辑修改迁移记录信息时，车辆营运司机字段出现错误信息的beg
Merge branch 'master' into zxr
将迁移记录模块状态“在案”改为“已入库”
修正身份证单词拼写
Merge branch 'master' of 192.168.0.222:bc-business into lbj
发票表单默认打印功能修改为自定义打印功能