Merge remote-tracking branch 'origin/master'

zss

2024-08-06 80ea05da0c43c2ae14e2d8cf8d284d96d9a8f1f5

 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}