# Conflicts: # src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java # src/main/java/com/gogirl/application/order/serve/impl/PayServiceImpl.java # src/main/java/com/gogirl/interfaces/xcx/PayController.java
