# Conflicts:
#	amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/CommonController.java

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