# Conflicts: # wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayController.java
# Conflicts: # wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java