Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f

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

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