Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-29 20d258abd2e5c0b9a6218f45718071225f8428de

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java

@@ -32,7 +32,7 @@
     *
     * @return
     */
    TemperingLayoutDTO queryTemperingOccupySlot(@Param(value = "count") int count);
    List<TemperingLayoutDTO> queryTemperingOccupySlot(@Param(value = "count") int count);


    List<SlotSequenceDTO> queryGlassMaxAndMin(@Param(value = "engineerId") String engineerId, @Param(value = "temperingLayoutId") Integer temperingLayoutId);