1、合并冲突

zhoushihao

2025-09-05 dd4778d2cc47467a39473f02513ec5438b5c9512

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml

@@ -141,7 +141,7 @@
                        order_number      as order_sort,
                        count(1)          as damage_count
                 from damage
                 where process_id = #{flowCardId}
                 where process_id = #{flowCardId} and type in (8,9) and status < 3
                 group by process_id, technology_number, order_number
             ),
             result_count as (