# Conflicts: # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java # mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
# Conflicts: # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java # mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java