From fbb48357d807b6e776821decacda68af6b2cc6aa Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 14:02:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainPlanWrapper.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainPlanWrapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainPlanWrapper.java
index 5b304da..cea3f8e 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainPlanWrapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainPlanWrapper.java
@@ -18,6 +18,7 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.sxkj.fw.device.dto.FwDeviceMaintainPlanDTO;
import org.sxkj.fw.device.entity.FwDeviceMaintainPlanEntity;
import org.sxkj.fw.device.vo.FwDeviceMaintainPlanVO;
import java.util.Objects;
@@ -25,8 +26,8 @@
/**
* 设备维护计划表 包装类,返回视图层所需的字段
*
- * @author lw
- * @since 2026-01-08
+ * @author Aix
+ * @since 2026-01-09
*/
public class FwDeviceMaintainPlanWrapper extends BaseEntityWrapper<FwDeviceMaintainPlanEntity, FwDeviceMaintainPlanVO> {
@@ -36,14 +37,13 @@
@Override
public FwDeviceMaintainPlanVO entityVO(FwDeviceMaintainPlanEntity fwDeviceMaintainPlan) {
- FwDeviceMaintainPlanVO fwDeviceMaintainPlanVO = Objects.requireNonNull(BeanUtil.copy(fwDeviceMaintainPlan, FwDeviceMaintainPlanVO.class));
- //User createUser = UserCache.getUser(fwDeviceMaintainPlan.getCreateUser());
- //User updateUser = UserCache.getUser(fwDeviceMaintainPlan.getUpdateUser());
- //fwDeviceMaintainPlanVO.setCreateUserName(createUser.getName());
- //fwDeviceMaintainPlanVO.setUpdateUserName(updateUser.getName());
+ return Objects.requireNonNull(BeanUtil.copy(fwDeviceMaintainPlan, FwDeviceMaintainPlanVO.class));
+ }
- return fwDeviceMaintainPlanVO;
+ public FwDeviceMaintainPlanEntity entityDTO(FwDeviceMaintainPlanDTO fwDeviceMaintainPlan) {
+
+ return Objects.requireNonNull(BeanUtil.copy(fwDeviceMaintainPlan, FwDeviceMaintainPlanEntity.class));
}
--
Gitblit v1.9.3