# Conflicts: # src/main/java/com/gogirl/infrastructure/mapper/order/serve/ScheduleServeMapper.java
# Conflicts: # src/main/java/com/gogirl/application/order/serve/impl/PayServiceImpl.java # src/main/java/com/gogirl/interfaces/market/coupon/CouponController.java
# Conflicts: # src/main/resources/application-dev.yml
