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

gdg

2021-01-29 d7427ab305dc17af447f5832903691eee329850c

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

@@ -115,8 +115,19 @@
    </insert>

    <update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
        update ope_warehouse_reserve set reagent_id=#{reagentId},warehouseId=#{warehouseId}, article_number=#{articleNumber}, reserve=#{reserve}, update_time=now(),
        container_id=#{containerId}
        update ope_warehouse_reserve
        <set>
        reagent_id=#{reagentId},
        reserve=#{reserve},
        update_time=now(),
        container_id=#{containerId},
        <if test="articleNumber != null and articleNumber !=''">
            article_number=#{articleNumber},
        </if>
        <if test="warehouseId != null and warehouseId !=''">
            warehouseId=#{warehouseId},
        </if>
        </set>
        where id=#{id}
    </update>