56c5a2921e
# Conflicts: # mobile-web/src/api/promotion.js # mobile-web/src/config/request.js |
||
---|---|---|
.. | ||
src/main/java/cn/iocoder/mall/user/api | ||
target/classes/cn/iocoder/mall/user/service/api | ||
pom.xml |
56c5a2921e
# Conflicts: # mobile-web/src/api/promotion.js # mobile-web/src/config/request.js |
||
---|---|---|
.. | ||
src/main/java/cn/iocoder/mall/user/api | ||
target/classes/cn/iocoder/mall/user/service/api | ||
pom.xml |