Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 server/service/src/main/java/com/doumee/service/business/WorktypeService.java

@@ -7,6 +7,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.util.List;
import java.util.Set;

/**
 * 工种信息表Service定义
@@ -108,4 +109,6 @@
    long count(Worktype worktype);

    List<String> importBatch(MultipartFile file);

    Set<Integer> importBatchForSolutions(MultipartFile file , Integer insuranceId);
}