Merge remote-tracking branch 'origin/master'

wangfei

2024-11-29 c377d90fe2a01c2118f6c69c3c177f75be7c318b

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/TaskCacheMapper.xml

@@ -13,6 +13,7 @@
        FROM task_cache
        <where>
            end_cell = #{line}
            and deleted = 0
            AND task_type in
            <foreach collection="taskTypes" item="item" open='(' close=')' separator=','>
                #{item}