From bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 15:02:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceScrapWrapper.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceScrapWrapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceScrapWrapper.java
index e481fd6..3dbfa4b 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceScrapWrapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceScrapWrapper.java
@@ -18,8 +18,10 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.sxkj.fw.device.dto.FwDeviceScrapDTO;
import org.sxkj.fw.device.entity.FwDeviceScrapEntity;
import org.sxkj.fw.device.vo.FwDeviceScrapVO;
+
import java.util.Objects;
/**
@@ -36,15 +38,10 @@
@Override
public FwDeviceScrapVO entityVO(FwDeviceScrapEntity fwDeviceScrap) {
- FwDeviceScrapVO fwDeviceScrapVO = Objects.requireNonNull(BeanUtil.copy(fwDeviceScrap, FwDeviceScrapVO.class));
-
- //User createUser = UserCache.getUser(fwDeviceScrap.getCreateUser());
- //User updateUser = UserCache.getUser(fwDeviceScrap.getUpdateUser());
- //fwDeviceScrapVO.setCreateUserName(createUser.getName());
- //fwDeviceScrapVO.setUpdateUserName(updateUser.getName());
-
- return fwDeviceScrapVO;
+ return Objects.requireNonNull(BeanUtil.copy(fwDeviceScrap, FwDeviceScrapVO.class));
}
-
+ public FwDeviceScrapEntity entityDTO(FwDeviceScrapDTO fwDeviceScrap) {
+ return Objects.requireNonNull(BeanUtil.copy(fwDeviceScrap, FwDeviceScrapEntity.class));
+ }
}
--
Gitblit v1.9.3