Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

昨天 c426aa30a98ce85b494de121c92e2a7d01673930

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java

@@ -116,6 +116,7 @@
            }
        }

        warehouse.setUpdateTime(new Date());
        if (!warehouseService.updateById(warehouse)) {
            return R.error("Update Fail");
        }