Merge remote-tracking branch 'origin/master'

吴羡

昨天 cdd9ef5944a1cda82d98f1544fb451c7dd4f8c3d

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

@@ -25,6 +25,12 @@

    List<TestItemDto> getItemTree();

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

    /**
     * 查询设备信息
     * @param managementNumberList
     * @return
     */
    List<Integer> selectDeviceIdsByNumber(@Param("managementNumberList") List<String> managementNumberList);
}