Merge remote-tracking branch 'origin/master'

zss

2024-05-31 781f2999683ca99577026df7ef4b748bf6366dac

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