# Conflicts: # order-application-service/src/main/java/cn/freemud/controller/OrderController.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java