Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/service/CollectionElementService.java
#	src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
This commit is contained in:
2025-04-14 13:30:02 +08:00
15 changed files with 1407 additions and 1008 deletions

View File

@@ -5,6 +5,7 @@ import com.ai.da.mapper.primary.entity.LibraryModelPoint;
import com.ai.da.model.dto.*;
import com.ai.da.model.vo.*;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -137,4 +138,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
CollectionElement editLevel2Type(Long elementId, String level2Type, String designType);
List<CollectionElement> getByProjectId(Long projectId);
List<CollectionElementVO> selectedImageSeg(List<MultipartFile> files, Long id, String type);
}