Merge remote-tracking branch 'origin/master' into master

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

 src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml

@@ -639,4 +639,12 @@
      </choose>
      order by oa.reagent_code asc
   </select>
    <select id="getStatus" resultMap="OpeReagentStatus">

        select *
        from ope_reagent_status
        where valid_flag = 1
        and reagent_code = #{reagentCode}
        and reagent_id = #{reagentId}
   </select>
</mapper>