- 
libin authored# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java 6e9e464f
| Name | Last commit | Last update | 
|---|---|---|
| .. | ||
| src/main/java/com/xxfc/platform/order | ||
| pom.xml | 
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
| Name | Last commit | Last update | 
|---|---|---|
| .. | ||
| src/main/java/com/xxfc/platform/order | Loading commit data... | |
| pom.xml | Loading commit data... |