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

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

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

@@ -118,19 +118,21 @@
    <update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
        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>
        <if test="userId != null and userId !=''">
            user_id=#{userId},
        </if>
            reagent_id=#{reagentId},
            reserve=#{reserve},
            update_time=now(),
            <if test="articleNumber != null and articleNumber !=''">
                article_number=#{articleNumber},
            </if>
            <if test="warehouseId != null and warehouseId !=''">
                warehouseId=#{warehouseId},
            </if>
            <if test="containerId != null and containerId !=''">
                container_id=#{containerId},
            </if>
            <if test="userId != null and userId !=''">
                user_id=#{userId},
            </if>
        </set>
        where id=#{id}
    </update>