Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-21 dd571bf55de7f9a72d458adc179958ed2f9473c0

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

@@ -13,13 +13,14 @@

    <!--展示该型号下的检验项目要求-->
    <select id="pageProductInformation" resultType="java.util.Map">
        select name,
        select id,
               name,
               father,
               unit,
               required,
               internal
        from lims_laboratory.product
        where state=1
        and specifications_id=#{specificationsId}
        where state = 1
          and specifications_id = #{specificationsId}
    </select>
</mapper>