Merge remote-tracking branch 'origin/master'

zss

2023-08-23 58579a382615c0f9bd03b52ae7227a2ca64f43f3

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

@@ -14,7 +14,7 @@

    <!--展示该型号下的检验项目要求-->
    <resultMap id="pageProductInformationMap" type="map">
        <id property="father" column="father"/>
        <id property="name" column="father"/>
        <collection property="children" resultMap="pageProductInformationTowMap" javaType="List"/>
    </resultMap>
    <resultMap id="pageProductInformationTowMap" type="map">
@@ -36,4 +36,10 @@
        where state = 1
          and specifications_id = #{specificationsId}
    </select>

    <select id="deleteList">
        update lims_laboratory.product
        set state=0
        where id in (${ids})
    </select>
</mapper>