Merge branch 'dev_zj' into dev

zss

2025-03-06 218c85f5128b95cedcc20127c60d1915bb1f7bc6

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

@@ -20,11 +20,9 @@

    int upStandardProductList(StandardProductList list);

    int delStandardProduct(JSONArray list);

    List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample);

    Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page);
    Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree);

    IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items);