Merge remote-tracking branch 'origin/master'

linwei

2026-01-09 bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceMaintainRecordWrapper.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.FwDeviceMaintainRecordDTO;
import org.sxkj.fw.device.entity.FwDeviceMaintainRecordEntity;
import org.sxkj.fw.device.vo.FwDeviceMaintainRecordVO;
import java.util.Objects;
@@ -36,14 +37,11 @@

   @Override
   public FwDeviceMaintainRecordVO entityVO(FwDeviceMaintainRecordEntity fwDeviceMaintainRecord) {
      FwDeviceMaintainRecordVO fwDeviceMaintainRecordVO = Objects.requireNonNull(BeanUtil.copy(fwDeviceMaintainRecord, FwDeviceMaintainRecordVO.class));
      return Objects.requireNonNull(BeanUtil.copy(fwDeviceMaintainRecord, FwDeviceMaintainRecordVO.class));
   }

      //User createUser = UserCache.getUser(fwDeviceMaintainRecord.getCreateUser());
      //User updateUser = UserCache.getUser(fwDeviceMaintainRecord.getUpdateUser());
      //fwDeviceMaintainRecordVO.setCreateUserName(createUser.getName());
      //fwDeviceMaintainRecordVO.setUpdateUserName(updateUser.getName());

      return fwDeviceMaintainRecordVO;
   public FwDeviceMaintainRecordEntity entityDTO(FwDeviceMaintainRecordDTO fwDeviceMaintainRecord) {
      return Objects.requireNonNull(BeanUtil.copy(fwDeviceMaintainRecord, FwDeviceMaintainRecordEntity.class));
   }