Merge remote-tracking branch 'origin/master'

zss

2024-07-23 dd301742784e570ec01098907f56e5c9c19b5a99

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

@@ -119,7 +119,8 @@
    </select>

    <select id="getInspectionItemSubclass" resultType="java.lang.String">
        SELECT ip.inspection_item_subclass FROM ins_product ip
        SELECT if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
                  ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass FROM ins_product ip
        where ip.ins_sample_id = #{id}
    </select>
</mapper>