Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-13 aac0fb36d6b6762f8f28827be417b6dc97e7e34e

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