分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 basic-server/src/main/java/com/ruoyi/basic/mapper/StructureItemParameterMapper.java

@@ -26,5 +26,9 @@
    List<TestItemDto> getItemTree();

    int removeNoSample(@Param("sample") String sample);

    List<StructureItemParameter> selectItemParameterList1(@Param("specimenName") String specimenName);

    List<StructureItemParameter> selectItemParameterList2(@Param("inspectionItemSubclass") String inspectionItemSubclass);
}