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

gdg

2021-02-25 db523e0fdf7801cdc01f10886f2c9aec04e711bb

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

@@ -24,6 +24,13 @@
    <update id="updateByReId" parameterType="java.util.Map">
        update ope_laboratory_reserve set reagent_id=#{newReId} where reagent_id=#{oldReId}
    </update>


    <update id="updateByReagent">
        update ope_laboratory_reserve
        set valid_flag = 0
        where reagent_id=#{reagentId}
        and house_id = #{houseId}
        and container_id = #{containerId}
        and user_id = #{userId}
        and valid_flag = 1
    </update>
</mapper>