Merge remote-tracking branch 'origin/master'

zss

2023-08-23 58579a382615c0f9bd03b52ae7227a2ca64f43f3

 inspection-server/src/main/resources/mapper/ReportMapper.xml

@@ -11,7 +11,6 @@
        im.name materialName,
        r.conclusion ,
        r.status ,
        r.approver ,
        check_time,
        u.name
        from lims_laboratory.report r