Merge remote-tracking branch 'origin/master'

于杰

2025-07-25 9d80c05bdbc18b4d7778828d411deb9b603f6a4b

 north-glass-erp/src/main/resources/mapper/pp/Report.xml

@@ -2113,7 +2113,7 @@
        WHERE
            rw.reporting_work_time >= #{selectTime1}
          AND rw.reporting_work_time <  #{selectTime2}
          AND dd.available = 0
          AND dd.available = 0 and rw.reviewed_state>=0
        <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
            and o.order_id regexp #{damageReportDTO.orderId}
        </if>