Merge remote-tracking branch 'origin/master'

wangfei

2024-12-23 250e2cd3c6b63605d2d23d496884ff18fac5e536

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java

@@ -23,5 +23,5 @@
     * @param state
     * @return
     */
    List<Integer> listBySlotState(@Param("leftingStation") List<Integer> liftingStation, @Param("state") List<Integer> state);
    List<RawGlassStorageDetails> listBySlotState(@Param("leftingStation") List<Integer> liftingStation, @Param("state") List<Integer> state);
}