From 8d2e27d818b1e77e146d90e0d26c93d542b681e0 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 08 五月 2025 15:28:57 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java index 73b3473..579e7be 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java @@ -55,10 +55,10 @@ @OperationLog("Create 绔嬩綋搴撶珯鐐圭粦瀹�") @PostMapping("/deviceBind/save") public R save(@RequestBody DeviceBind deviceBind) { - deviceBind.setCreateBy(getLoginUserId()); - deviceBind.setCreateTime(new Date()); - deviceBind.setUpdateBy(getLoginUserId()); - deviceBind.setUpdateTime(new Date()); +// deviceBind.setCreateBy(getLoginUserId()); +// deviceBind.setCreateTime(new Date()); +// deviceBind.setUpdateBy(getLoginUserId()); +// deviceBind.setUpdateTime(new Date()); if (!deviceBindService.save(deviceBind)) { return R.error("Save Fail"); } @@ -69,8 +69,8 @@ @OperationLog("Update 绔嬩綋搴撶珯鐐圭粦瀹�") @PostMapping("/deviceBind/update") public R update(@RequestBody DeviceBind deviceBind) { - deviceBind.setUpdateBy(getLoginUserId()); - deviceBind.setUpdateTime(new Date()); +// deviceBind.setUpdateBy(getLoginUserId()); +// deviceBind.setUpdateTime(new Date()); if (!deviceBindService.updateById(deviceBind)) { return R.error("Update Fail"); } -- Gitblit v1.9.1