1、员工增加现住址字段

2、pad接口：根据nuid获取护理单元设备信息增加摄像头sn字段

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 = "设备序号")

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,

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;
 }

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;

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 = "是否吸烟")

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 = "政治面貌")

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 = "身份证号")