Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

src/main/java/com/zhgd/xmgl/modules/antipressurefold/entity/AntiPressureFoldDev.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -102,4 +103,18 @@ public class AntiPressureFoldDev implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间")
 	private java.util.Date updateTime;
+
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDev.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.bridgeerectmachine.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -95,4 +96,15 @@ public class BridgeErectMachineDev implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateDate;
+    /**
+     * 合作单位ids
+     */
+    @ApiModelProperty(value = "合作单位ids")
+    private java.lang.String enterpriseIds;
+    /**
+     * 合作单位名称
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "合作单位名称")
+    private java.lang.String enterpriseName;
 }

src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashDev.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.car.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -24,7 +25,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="CarWashDev实体类",description="CarWashDev")
 public class CarWashDev implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**id*/
     @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="id")
@@ -55,4 +56,18 @@ public class CarWashDev implements Serializable {
 	@Excel(name = "设备状态，0正常，1异常", width = 15)
    @ApiModelProperty(value="设备状态，0正常，1异常")
 	private java.lang.Integer devState  ;
+
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDev.java

@@ -119,6 +119,19 @@ public class ConcreteMonitorDev implements Serializable {
     @ApiModelProperty(value = "devOnline：设备状态1在线0离线")
     private Integer devOnline;
 
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @TableField(exist = false)
     @ApiModelProperty(value = "监测点位置")
     private List<ConcreteMonitorDevPointPosition> pointList;

src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -121,4 +122,18 @@ public class ConcreteMixStationDev implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateDate;
+
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformDev.java

@@ -133,6 +133,20 @@ public class DischargingPlatformDev implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date playingTime;
+
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @TableField(exist = false)
     @ApiModelProperty(value = "devOnline：设备状态1在线0离线")
     private Integer devOnline;

src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/DoubleCarbonDev.java

@@ -87,6 +87,20 @@ public class DoubleCarbonDev implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     /**
      * 设备加油记录列表
      */

src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/PhotovoltaicPowerDev.java

@@ -143,5 +143,18 @@ public class PhotovoltaicPowerDev implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
 }
 

src/main/java/com/zhgd/xmgl/modules/electrical/entity/ElectricalDev.java

@@ -132,6 +132,19 @@ public class ElectricalDev implements Serializable {
     private java.lang.String devScret;
 
 
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @TableField(exist = false)
     @ApiModelProperty(value = "是否在线 1为离线 2为在线 ")
     private java.lang.Integer isClosed;

src/main/java/com/zhgd/xmgl/modules/environment/entity/EnvironmentDev.java

@@ -97,7 +97,19 @@ public class EnvironmentDev implements Serializable {
     private java.lang.Integer createDataType;
     @ApiModelProperty(value = "喷淋状态（1投运2未投运）")
     private java.lang.Integer sprayStatus;
-
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @TableField(exist = false)
     @ApiModelProperty(value = "视频列表")
     private List<BigDeviceVideo> videoList;

src/main/java/com/zhgd/xmgl/modules/environment/entity/SprayDev.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.environment.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -22,7 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="SprayDev实体类",description="SprayDev")
 public class SprayDev implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**id*/
     @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="id")
@@ -57,4 +58,17 @@ public class SprayDev implements Serializable {
     @Excel(name = "关通道号", width = 15)
     @ApiModelProperty(value="关通道号")
     private java.lang.Integer closeChannelNo  ;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java

@@ -102,7 +102,19 @@ public class FrontierProtectionDev implements Serializable {
     private Integer status;
     @ApiModelProperty(value = "备注")
     private String remark;
-
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @TableField(exist = false)
     @ApiModelProperty(value = "班组名称")
     private String teamName;

src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java

@@ -101,7 +101,19 @@ public class FrontierProtectionNoNetDev implements Serializable {
 
     @ApiModelProperty(value = "设备在线状态 0离线；1在线")
     private Integer onLine;
-
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @TableField(exist = false)
     @ApiModelProperty(value = "责任班组名称")
     private java.lang.String dutyTeamInfoName;

src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java

@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.gt.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -207,4 +208,17 @@ public class GtMaterialDevice implements Serializable {
 
     @ApiModelProperty(value = "设备去向")
     private java.lang.String equipmentWhereabouts;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDev.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -83,4 +84,17 @@ public class HangBasketDev implements Serializable {
 	@Excel(name = "项目sn", width = 15)
 	@ApiModelProperty(value = "项目sn")
 	private java.lang.String projectSn;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureDevice.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.highformwork.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -46,4 +47,17 @@ public class HighFormworkMeasureDevice implements Serializable {
 	private java.lang.String deviceName  ;
 	@ApiModelProperty(value = "类型：1立杆轴力2水平位移3模板沉降4立杆倾斜5地基沉降")
 	private java.lang.Integer deviceType  ;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
 }

src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundMeasureDev.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.massrebound.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -22,7 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="MassReboundMeasureDev实体类",description="MassReboundMeasureDev")
 public class MassReboundMeasureDev implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**id*/
     @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="id")
@@ -39,4 +40,17 @@ public class MassReboundMeasureDev implements Serializable {
 	@Excel(name = "设备编号", width = 15)
    @ApiModelProperty(value="设备编号")
 	private java.lang.String devNo  ;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java

@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.mixingstation.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -117,4 +118,17 @@ public class MsMixedSoilDev implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateDate;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java

@@ -103,6 +103,19 @@ public class PaveCompactionDev implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "上次数据上传时间 yyyy-MM-dd HH:mm:ss")
 	private java.util.Date lastDataTime;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
 	@TableField(exist = false)
 	@ApiModelProperty(value = "设备在线状态（0.离线 1.在线）")
 	private java.lang.Integer devOnline;

src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java

@@ -103,7 +103,19 @@ public class PaveDev implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "上次数据上传时间 yyyy-MM-dd HH:mm:ss")
 	private java.util.Date lastDataTime;
-
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
 	@TableField(exist = false)
 	@ApiModelProperty(value = "设备在线状态（0.离线 1.在线）")
 	private java.lang.Integer devOnline;

src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.pitchmixstation.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -115,4 +116,17 @@ public class PitchMixStationDev implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateDate;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDev.java

@@ -102,6 +102,19 @@ public class PoisonousGasDev implements Serializable {
     private Long dutyTeamInfoId;
     @ApiModelProperty(value = "图片")
     private String image;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @ApiModelProperty(value = "责任班组名称")
     @TableField(exist = false)
     private String dutyTeamInfoName;

src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -101,4 +102,17 @@ public class PressureTestMachineDev implements Serializable {
 	@Excel(name = "项目sn", width = 15)
 	@ApiModelProperty(value = "项目sn")
 	private java.lang.String projectSn;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java

@@ -77,6 +77,19 @@ public class SafetyHatDev implements Serializable {
     private java.lang.Integer online;
     @ApiModelProperty(value = "安全帽外部user_id")
     private java.lang.String extUserId;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     /**
      * 人员名称
      */

src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageDev.java

@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.sewage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -102,4 +103,17 @@ public class SewageDev implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateDate;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/smartgrout/entity/SmartGroutDev.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -109,4 +110,17 @@ public class SmartGroutDev implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间")
 	private java.util.Date updateTime;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/smarttension/entity/SmartTensionDev.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -105,4 +106,17 @@ public class SmartTensionDev implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间")
 	private java.util.Date updateTime;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDev.java

@@ -91,7 +91,19 @@ public class SmokeDev implements Serializable {
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
-
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @ApiModelProperty(value = "责任班组名称")
     @TableField(exist = false)
     private String dutyTeamInfoName;

src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -73,4 +74,17 @@ public class SprayRtDev implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateDate;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/stablewater/entity/StableWaterMixStationDev.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.stablewater.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -113,4 +114,17 @@ public class StableWaterMixStationDev implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateDate;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+
 }

src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardDev.java

@@ -27,7 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="StandardDev实体类",description="StandardDev")
 public class StandardDev implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**id*/
     @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="id")
@@ -149,7 +149,19 @@ public class StandardDev implements Serializable {
     @Excel(name = "设备实时温度", width = 15)
     @ApiModelProperty(value="设备实时温度")
     private java.lang.String devTemperature  ;
-
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @TableField(exist = false)
     @ApiModelProperty(value="项目名称")
     private java.lang.String projectName ;

src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java

@@ -103,7 +103,19 @@ public class UniversalTestDev implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
-
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @TableField(exist = false)
     @ApiModelProperty(value = "试验总次数")
     private Integer testTotalNum;

src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java

@@ -103,6 +103,19 @@ public class VehiclePositionDev implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "新增时间")
     private java.util.Date addTime;
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
 
     @TableField(exist = false)
     @ApiModelProperty(value = "在线状态（0.离线 1.在线）")

src/main/java/com/zhgd/xmgl/modules/worker/entity/UfaceDev.java

@@ -136,7 +136,19 @@ public class UfaceDev implements Serializable {
     @Excel(name = "设备位置归属，1工地区，2生活区，3项目部", width = 15)
     @ApiModelProperty(value = "设备位置归属，1工地区，2生活区，3项目部")
     private java.lang.Integer devGroupType;
-
+	/**
+	 * 合作单位ids
+	 */
+	@ApiModelProperty(value = "合作单位ids")
+	private java.lang.String enterpriseIds;
+	
+	/**
+	 * 合作单位名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "合作单位名称")
+	private java.lang.String enterpriseName;
+	
     @ApiModelProperty(value = "设备状态1在线0离线")
     @TableField(exist = false)
     private java.lang.Integer devOnline;

src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java

@@ -511,7 +511,7 @@ public class XzSecurityQualityInspectionRecordController {
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
     })
-    @PostMapping( "/querySpecialPage")
+    @PostMapping( "/specialPage")
     public Result<Page<XzSecurityQualityInspectionRecordVo>> querySpecialPage(@RequestBody Map<String, Object> map) {
         return Result.success(qualityInspectionRecordService.querySpecialPage(map));
     }