Merge remote-tracking branch 'origin/master'

zss

2024-07-17 b09b781d22a81eab459c63053a54df4761e770c5

 cnas-server/src/main/resources/mapper/StructureTestMapper.xml

@@ -14,7 +14,8 @@
        sto.update_time,
        sto.code,
        sto.laboratory_id,
        GROUP_CONCAT(p.name) product
        GROUP_CONCAT(p.name) product,
        sto.specimen_name_en
        from structure_test_object sto
        left join user u1 on sto.create_user = u1.id
        left join user u2 on sto.update_user = u2.id