pom.xml
6.48 KB
-
Merge branch 'feature/20201223_posConfirmTakeKoubeiwaimai_miaohui' into qa · c90beba2
# Conflicts: # order-management/src/main/java/cn/freemud/management/enums/OrderSource.java # order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java
缪晖 committed