Conflicts:
	amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PreparationMoney.java
	amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties