From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 74d010f..ba59208 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -375,7 +375,7 @@
wrapper_specialDeviceHistory.eq("organization_id",updateSpecialDevice.getOrganizationId());
SpecialDeviceHistory specialDeviceHistory = specialDeviceHistoryMapper.selectOne(wrapper_specialDeviceHistory);
SpecialDeviceHistory updateSpecialDeviceHistory = new SpecialDeviceHistory();
- BeanUtils.copyProperties(specialDevice,updateSpecialDeviceHistory);
+ BeanUtils.copyProperties(updateSpecialDevice,updateSpecialDeviceHistory);
updateSpecialDeviceHistory.setCreateTime(null);
updateSpecialDeviceHistory.setUpdateTime(null);
updateSpecialDeviceHistory.setIsDelete(null);
--
Gitblit v1.8.0