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

yaowanxin

6 天以前 a0914318549b357ef3c438d0c2a3714f58ea3487

 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java

@@ -72,6 +72,7 @@
            newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
            newStockInventory.setQualitity(stockInventoryDto.getQualitity());
            newStockInventory.setVersion(1);
            newStockInventory.setRemark(stockInventoryDto.getRemark());
            stockInventoryMapper.insert(newStockInventory);
        }else {
             stockInventoryMapper.updateAddStockInventory(stockInventoryDto);