# Conflicts:
#	src/main/java/com/quantgroup/asset/distribution/controller/FundModuleController.java
#	src/test/java/com/quantgroup/asset/distribution/niwodai/NiwodaiTest.java