# Conflicts:
#	amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfIcbcRecordMapper.xml
#	amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfIcbcServiceImpl.java

Merge branch 'developer_bw' of http://39.100.92.250:5000/moa/jxdj_zx/amos-boot-zx-biz into developer_bw