-
2. use common function 4 location
-
Conflicts: order/src/main/java/com/yohoufo/order/service/PaymentSupportService.java users/src/main/java/com/yohoufo/user/service/impl/AlipayServiceImpl.java
-
# Conflicts: # web/src/main/resources/global.properties
