Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

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

@@ -213,8 +213,16 @@
        from ope_warehouse_reserve as owr
        where owr.reserve > 0
        and owr.reagent_id = #{id}
        and owr.valid_flag = 1
        group by owr.reagent_id
    </select>
    <select id="getRowData" resultMap="OpeWarehouseReserve">

        <include refid="queryColumns"/>
        from ope_warehouse_reserve as oa
        <include refid="queryJoins"/>
        where oa.id = #{id}
    </select>

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