# Conflicts: # src/main/java/com/ai/da/controller/ConvenientInquiryController.java # src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java # src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
# Conflicts: # src/main/java/com/ai/da/controller/ConvenientInquiryController.java # src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java # src/main/java/com/ai/da/service/impl/DesignServiceImpl.java