# Conflicts: # src/main/resources/application-dev.yml
# Conflicts: # src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java # src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java