Merge remote-tracking branch 'origin/master'

zss

2023-08-15 d9e5ab959b7ff2c578672938c205a7a82765ef9f

 standard-server/src/main/resources/mapper/RawInsProductMapper.xml

@@ -15,4 +15,20 @@
    <select id="selectPageDevice" resultType="map">

    </select>

    <select id="inspectIdSelect" resultType="map">
        SELECT r.`name`, r.`specifications`, r.`user_name`
        FROM raw_inspect r, raw_ins_product p
        WHERE p.`id` = #{inspectId}
          AND p.`state` = 1
          AND r.`state` = 1
          AND r.`id` = p.`raw_inspect_id`
    </select>

    <select id="parentClassification" resultType="map">
        SELECT DISTINCT d.`father`
        FROM device d
        WHERE d.`state` = 1
          AND d.`father` IS NOT NULL
    </select>
</mapper>