# Conflicts: # order-management/src/main/java/cn/freemud/management/enums/OrderSource.java # order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java