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

zss

2025-03-13 3b92cf3f9cd038c446e390aab18e759b0463d24a

 basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java

@@ -18,7 +18,6 @@

    List<FactoryDto> selectStandardTreeList();


    int addStandardTree(StandardTree standardTree);

    int delStandardTree(String tree);
@@ -40,13 +39,4 @@
    void resetTreeOfAsk(String tree, Integer standardId);

    void importWorkstationExcel(MultipartFile file);

    /**
     * 标准数排序
     * @param list
     * @return
     */
    boolean updateTreeSort(List<FactoryDto> list);

    int updateStandardTree(StandardTree standardTree);
}