Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

buhuazhen

7 天以前 3ef1cf899c2bf558b934fd2c5dfdf0a970df8c43

 main-business/src/main/java/com/ruoyi/business/service/impl/PendingInventoryServiceImpl.java

@@ -293,6 +293,7 @@
                officialInventory.setRegistrantId(1L);
                officialInventory.setType(pendingInventory.getType());
                officialInventory.setSupplierId(pendingInventoryDto.getSupplierId());
                officialInventory.setCode(pendingInventory.getCode());
                officialInventoryMapper.insert(officialInventory);
            } else {
                OfficialInventory officialInventory = officialInventoryMapper.selectById(pendingInventoryDto.getOfficialId());