# Conflicts: # src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java # src/main/java/com/gogirl/infrastructure/mapper/market/discount/LeisureDiscountConfigLimitMapper.java # src/main/resources/mapper/LeisureDiscountConfigLimitMapper.xml
