From dbf915daa3864aa8738616ad2506b0b7baee8886 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 28 Oct 2025 15:40:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=91=98=E5=B7=A5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=8E=B0=E4=BD=8F=E5=9D=80=E5=AD=97=E6=AE=B5=202=E3=80=81pad?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9A=E6=A0=B9=E6=8D=AEnuid=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?sn=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/iot/tplink/camerainfo/entity/AppCameraInfo.java | 4 ++++
 .../tplink/camerainfo/mapper/xml/AppCameraInfoMapper.xml    | 1 +
 .../src/main/java/com/nu/dto/EmployeesApplyMQDto.java       | 4 ++++
 .../src/main/java/com/nu/entity/CameraInfoEntity.java       | 5 +++++
 .../nu/modules/employeesInfo/entity/BizEmployeesInfo.java   | 6 ++++++
 .../nu/modules/employeesapply/entity/EmployeesApply.java    | 6 ++++++
 .../employessadvisiory/entity/NuEmployeesAdvisoryInfo.java  | 6 ++++++
 7 files changed, 32 insertions(+)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppCameraInfo.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppCameraInfo.java
index 45bccdbb..b428e948 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppCameraInfo.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppCameraInfo.java
@@ -33,6 +33,10 @@ public class AppCameraInfo implements Serializable {
 	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "ID")
     private Integer id;
+	/**设备编码*/
+	@Excel(name = "设备编码", width = 15)
+	@ApiModelProperty(value = "设备编码")
+	private String sn;
 	/**设备序号*/
 	@Excel(name = "设备序号", width = 15)
     @ApiModelProperty(value = "设备序号")
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppCameraInfoMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppCameraInfoMapper.xml
index f7c75b75..cd28f7a7 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppCameraInfoMapper.xml
+++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/mapper/xml/AppCameraInfoMapper.xml
@@ -4,6 +4,7 @@
 
     <select id="findPage" parameterType="com.nu.modules.iot.tplink.camerainfo.entity.AppCameraInfo" resultType="com.nu.modules.iot.tplink.camerainfo.entity.AppCameraInfo">
         select a.id,
+               a.sn,
             a.device_index as deviceIndex,
             device_name as deviceName,
             device_type as deviceType,
diff --git a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java
index 4814cd5f..9f0a239b 100644
--- a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java
+++ b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java
@@ -104,4 +104,8 @@ public class EmployeesApplyMQDto implements Serializable {
     private Date startTime;
     /**身份证有效结束日期 */
     private Date endTime;
+    /**
+     * 现住址
+     */
+    private String currentAddress;
 }
diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java
index e40e0eb9..8d900806 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java
@@ -3,6 +3,7 @@ package com.nu.entity;
 import cn.hutool.json.JSONObject;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 @Data
 public class CameraInfoEntity {
@@ -11,6 +12,10 @@ public class CameraInfoEntity {
     /**ID*/
     @ApiModelProperty(value = "ID")
     private Integer id;
+    /**设备编码*/
+    @Excel(name = "设备编码", width = 15)
+    @ApiModelProperty(value = "设备编码")
+    private String sn;
     /**设备序号*/
     @ApiModelProperty(value = "设备序号")
     private String deviceIndex;
diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java
index 76532551..86bb2f65 100644
--- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java
+++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java
@@ -94,6 +94,12 @@ public class BizEmployeesInfo implements Serializable {
 	@Excel(name = "家庭住址", width = 15)
     @ApiModelProperty(value = "家庭住址")
     private java.lang.String address;
+	/**
+	 * 现住址
+	 */
+	@Excel(name = "现住址", width = 15)
+	@ApiModelProperty(value = "现住址")
+	private String currentAddress;
 	/**是否吸烟*/
 	@Excel(name = "是否吸烟", width = 15, dicCode = "is_smoking")
     @ApiModelProperty(value = "是否吸烟")
diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java
index 09ba7f47..3e04448f 100644
--- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java
+++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java
@@ -100,6 +100,12 @@ public class EmployeesApply implements Serializable {
 	@Excel(name = "户籍所在地", width = 15)
     @ApiModelProperty(value = "户籍所在地")
     private java.lang.String houseAddress;
+    /**
+     * 现住址
+     */
+    @Excel(name = "现住址", width = 15)
+    @ApiModelProperty(value = "现住址")
+    private String currentAddress;
 	/**政治面貌*/
 	@Excel(name = "政治面貌", width = 15)
     @ApiModelProperty(value = "政治面貌")
diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/entity/NuEmployeesAdvisoryInfo.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/entity/NuEmployeesAdvisoryInfo.java
index b32448e2..89bda95a 100644
--- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/entity/NuEmployeesAdvisoryInfo.java
+++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/entity/NuEmployeesAdvisoryInfo.java
@@ -97,6 +97,12 @@ public class NuEmployeesAdvisoryInfo implements Serializable {
 	@Excel(name = "住址（身份证上）", width = 15)
     @ApiModelProperty(value = "住址（身份证上）")
     private java.lang.String idCardAddress;
+    /**
+     * 现住址
+     */
+    @Excel(name = "现住址", width = 15)
+    @ApiModelProperty(value = "现住址")
+    private String currentAddress;
 	/**身份证号*/
 	@Excel(name = "身份证号", width = 15)
     @ApiModelProperty(value = "身份证号")