Merge branch 'dev' into 'new-fetch-status-warehouse'

# Conflicts:
#   src/main/java/com/afp/ordermanagement/model/Order.java
#   src/main/java/com/afp/ordermanagement/service/OrderService.java