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

yaowanxin

5 天以前 dfacb4e315a49f2c0399574ef094c87b96e7e248

 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);