Merge branch 'master' into cnas

zss

2025-01-13 476740c4330135b38be6a32f54dbe1bbcd32476a

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

@@ -36,6 +36,7 @@
                left join user u1 on sm.create_user = u1.id
                left join user u2 on sm.update_user = u2.id
                left join structure_test_object sto on sm.structure_test_object_id = sto.id
                where sm.code != '委托要求'
                ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}