- 
jiaorz authored# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java 2ae7951a
| Name | Last commit | Last update | 
|---|---|---|
| .. | ||
| java/com/xxfc/platform/activity | ||
| resources | 
# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
| Name | Last commit | Last update | 
|---|---|---|
| .. | ||
| java/com/xxfc/platform/activity | Loading commit data... | |
| resources | Loading commit data... |