# Conflicts: # release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java # release-service/src/main/java/com/mmc/csf/release/feign/UserAppApi.java # release-service/src/main/java/com/mmc/csf/release/service/FlyerTrainingService.java # release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java
