# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/dto/delivery/QueryDeliveryTemplateResponse.java # order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
