Merge remote-tracking branch 'origin/master'

zss

2024-07-22 c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a

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

@@ -117,4 +117,9 @@
            ${ew.customSqlSegment}
        </if>
    </select>

    <select id="getInspectionItemSubclass" resultType="java.lang.String">
        SELECT ip.inspection_item_subclass FROM ins_product ip
        where ip.ins_sample_id = #{id}
    </select>
</mapper>