# Conflicts: # open-api/src/main/java/com/iformall/dto/PreviewVideoDTO.java # suimangCApi/src/main/resources/application-dev.yml # suimangCApi/src/main/resources/application-prod.yml