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

zhou zhou

8 天以前 7c96576938ad64e30db51c597c6be3369dafe4b1

 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");
        }