Merge remote-tracking branch 'origin/master'

wu

2024-08-07 dd60bcc7b38c2a19c02a20550a393987fc5a5a27

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