Merge remote-tracking branch 'origin/master'

Crunchy

2024-06-04 ea7654c0cdb21ec7e8f854df6d0a7367b5e5d6ac

 inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java

@@ -31,6 +31,8 @@

    List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees);

    List<StandardProductList> selectStandardProductListByTree3(String tree, String sample, String model, String trees);

    List<SampleTypeDto> getStandardTree2();
}