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

lyfO_o

2021-06-11 ea5cbe91b94e48e9f63947d01decdf919848ae91

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

@@ -208,6 +208,13 @@

        order by oa.update_time,oa.reserve
    </select>
    <select id="countByReagentId" resultType="java.lang.Integer">
        select ifnull(sum(owr.reserve),0)
        from ope_warehouse_reserve as owr
        where owr.reserve > 0
        and owr.reagent_id = #{id}
        group by owr.reagent_id
    </select>

    <update id="updateByReId" parameterType="java.util.Map">
        update ope_warehouse_reserve set reagent_id=#{newReId} where reagent_id=#{oldReId}