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

maven

5 天以前 ec3b3bfe38bbde2aecea411c70e1bc868324d9be

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -22,6 +22,10 @@
           <if test="ew.version != null">
               version = version + 1,
            </if>
            <if test="ew.remark != null and ew.remark !=''">
                remark = #{ew.remark},
            </if>
            update_time = now()
        </set>
        where product_model_id = #{ew.productModelId}
    </update>
@@ -34,6 +38,10 @@
            <if test="ew.version != null">
                version = version + 1,
            </if>
            <if test="ew.remark != null and ew.remark !=''">
                remark = #{ew.remark},
            </if>
            update_time = now()
        </set>
        where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
    </update>