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

gdg

2021-02-02 529173267b4e7b4b296e92a8c8705e0da5180c89

 src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java

@@ -307,6 +307,7 @@
                    opeWarehouseReserve.setArticleNumber(inWarehouseInfo.getArticleNumber());
                    opeWarehouseReserve.setReserve(0);
                    opeWarehouseReserve.setWarehouseId(inWarehouseInfo.getWarehouseId());
                    opeWarehouseReserve.setUserId("admin");
                }
                //库存加1
                opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() + 1);