Merge remote-tracking branch 'origin/master'

zss

2024-06-07 73507854f0618fe7f96c93aa64b870ff9c44664a

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

@@ -33,7 +33,9 @@
        template_id,
        son_laboratory,
        ask,
        ask_tell
        ask_tell,
        inspection_item_class,
        inspection_item_class_en
        from structure_item_parameter
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}