-
http://10.5.52.3/youjj/cloud-platformhanfeng authored
# Conflicts: # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java
5c239dbf
# Conflicts: # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java