56c5a2921e
# Conflicts: # mobile-web/src/api/promotion.js # mobile-web/src/config/request.js |
||
---|---|---|
.. | ||
user-application | ||
user-sdk | ||
user-service-api | ||
user-service-impl | ||
pom.xml |
56c5a2921e
# Conflicts: # mobile-web/src/api/promotion.js # mobile-web/src/config/request.js |
||
---|---|---|
.. | ||
user-application | ||
user-sdk | ||
user-service-api | ||
user-service-impl | ||
pom.xml |