diff --git a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/entity/AntiPressureFoldDev.java b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/entity/AntiPressureFoldDev.java index b119c5e63..420b25e77 100644 --- a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/entity/AntiPressureFoldDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/entity/AntiPressureFoldDev.java @@ -102,4 +102,11 @@ public class AntiPressureFoldDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; + + /** + * 合作单位id + */ + @Excel(name = "合作单位id", width = 15) + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDev.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDev.java index 5710e714d..8ba694d9c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDev.java @@ -95,4 +95,11 @@ 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; + + /** + * 合作单位id + */ + @Excel(name = "合作单位id", width = 15) + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashDev.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashDev.java index 1e1b1dbee..dc73c8c31 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashDev.java @@ -24,7 +24,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 +55,11 @@ public class CarWashDev implements Serializable { @Excel(name = "设备状态,0正常,1异常", width = 15) @ApiModelProperty(value="设备状态,0正常,1异常") private java.lang.Integer devState ; + + /** + * 合作单位id + */ + @Excel(name = "合作单位id", width = 15) + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDev.java b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDev.java index f2eb011bf..072611454 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDev.java @@ -119,6 +119,12 @@ public class ConcreteMonitorDev implements Serializable { @ApiModelProperty(value = "devOnline:设备状态1在线0离线") private Integer devOnline; + /** + * 合作单位id + */ + @Excel(name = "合作单位id", width = 15) + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "监测点位置") private List pointList; diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java index 7e80bc542..3428c2235 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java @@ -121,4 +121,11 @@ 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; + + /** + * 合作单位id + */ + @Excel(name = "合作单位id", width = 15) + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformDev.java b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformDev.java index 8a442041b..2f652668f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformDev.java @@ -133,6 +133,13 @@ public class DischargingPlatformDev implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date playingTime; + + /** + * 合作单位id + */ + @Excel(name = "合作单位id", width = 15) + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "devOnline:设备状态1在线0离线") private Integer devOnline; diff --git a/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/DoubleCarbonDev.java b/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/DoubleCarbonDev.java index 8944617d1..eb6e63e6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/DoubleCarbonDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/DoubleCarbonDev.java @@ -87,6 +87,12 @@ 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; + + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; /** * 设备加油记录列表 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/PhotovoltaicPowerDev.java b/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/PhotovoltaicPowerDev.java index adf5dc767..18e2e218c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/PhotovoltaicPowerDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/PhotovoltaicPowerDev.java @@ -143,5 +143,9 @@ 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; -} + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId;} diff --git a/src/main/java/com/zhgd/xmgl/modules/electrical/entity/ElectricalDev.java b/src/main/java/com/zhgd/xmgl/modules/electrical/entity/ElectricalDev.java index 0a4786386..d628869e9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/electrical/entity/ElectricalDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/electrical/entity/ElectricalDev.java @@ -132,6 +132,11 @@ public class ElectricalDev implements Serializable { private java.lang.String devScret; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "是否在线 1为离线 2为在线 ") private java.lang.Integer isClosed; diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/EnvironmentDev.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/EnvironmentDev.java index 830badb36..a9c085c45 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/entity/EnvironmentDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/EnvironmentDev.java @@ -97,7 +97,11 @@ public class EnvironmentDev implements Serializable { private java.lang.Integer createDataType; @ApiModelProperty(value = "喷淋状态(1投运2未投运)") private java.lang.Integer sprayStatus; - + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "视频列表") private List videoList; diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/SprayDev.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/SprayDev.java index 1d7c5e1ed..f515d4154 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/entity/SprayDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/SprayDev.java @@ -22,7 +22,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 +57,9 @@ public class SprayDev implements Serializable { @Excel(name = "关通道号", width = 15) @ApiModelProperty(value="关通道号") private java.lang.Integer closeChannelNo ; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java b/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java index 91823113e..c88c4a365 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java @@ -102,7 +102,11 @@ public class FrontierProtectionDev implements Serializable { private Integer status; @ApiModelProperty(value = "备注") private String remark; - + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "班组名称") private String teamName; diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java index 7f7df98ab..dcdb6f716 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java @@ -101,7 +101,11 @@ public class FrontierProtectionNoNetDev implements Serializable { @ApiModelProperty(value = "设备在线状态 0离线;1在线") private Integer onLine; - + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "责任班组名称") private java.lang.String dutyTeamInfoName; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java index d624ae64e..5d5b41641 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java @@ -207,4 +207,8 @@ public class GtMaterialDevice implements Serializable { @ApiModelProperty(value = "设备去向") private java.lang.String equipmentWhereabouts; -} + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId;} diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDev.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDev.java index 78a036844..17950ec4a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDev.java @@ -83,4 +83,8 @@ public class HangBasketDev implements Serializable { @Excel(name = "项目sn", width = 15) @ApiModelProperty(value = "项目sn") private java.lang.String projectSn; -} + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId;} diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureDevice.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureDevice.java index 62ee34ce1..3bfff8435 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureDevice.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureDevice.java @@ -46,4 +46,9 @@ public class HighFormworkMeasureDevice implements Serializable { private java.lang.String deviceName ; @ApiModelProperty(value = "类型:1立杆轴力2水平位移3模板沉降4立杆倾斜5地基沉降") private java.lang.Integer deviceType ; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundMeasureDev.java b/src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundMeasureDev.java index 9839ee4ce..2a26b602a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundMeasureDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundMeasureDev.java @@ -22,7 +22,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 +39,8 @@ public class MassReboundMeasureDev implements Serializable { @Excel(name = "设备编号", width = 15) @ApiModelProperty(value="设备编号") private java.lang.String devNo ; -} + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId;} diff --git a/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java b/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java index bb2773c50..4d77e81a8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java @@ -117,4 +117,8 @@ 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; -} + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId;} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java index f7d4fa5af..cabad45da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java @@ -103,6 +103,11 @@ 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; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "设备在线状态(0.离线 1.在线)") private java.lang.Integer devOnline; diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java index a35972deb..d309f6e83 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java @@ -103,7 +103,11 @@ 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; - + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "设备在线状态(0.离线 1.在线)") private java.lang.Integer devOnline; diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java index a16033ad7..92a634964 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java @@ -115,4 +115,8 @@ 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; -} + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId;} diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDev.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDev.java index dfa9703e7..d3218dd03 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDev.java @@ -102,6 +102,11 @@ public class PoisonousGasDev implements Serializable { private Long dutyTeamInfoId; @ApiModelProperty(value = "图片") private String image; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @ApiModelProperty(value = "责任班组名称") @TableField(exist = false) private String dutyTeamInfoName; diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java index af132cedf..237623313 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java @@ -101,4 +101,9 @@ public class PressureTestMachineDev implements Serializable { @Excel(name = "项目sn", width = 15) @ApiModelProperty(value = "项目sn") private java.lang.String projectSn; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java index 0156b349d..15c3c4112 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java @@ -77,6 +77,11 @@ public class SafetyHatDev implements Serializable { private java.lang.Integer online; @ApiModelProperty(value = "安全帽外部user_id") private java.lang.String extUserId; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; /** * 人员名称 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageDev.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageDev.java index 841103daa..b92de9324 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageDev.java @@ -102,4 +102,9 @@ 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; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/entity/SmartGroutDev.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/entity/SmartGroutDev.java index cd121f061..f25597618 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/entity/SmartGroutDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/entity/SmartGroutDev.java @@ -109,4 +109,9 @@ public class SmartGroutDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/SmartTensionDev.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/SmartTensionDev.java index 654682692..29d43fb85 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/SmartTensionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/SmartTensionDev.java @@ -105,4 +105,9 @@ public class SmartTensionDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDev.java b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDev.java index a0c5dd43b..9afd17ec3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDev.java @@ -91,7 +91,11 @@ public class SmokeDev implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String remark; - + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @ApiModelProperty(value = "责任班组名称") @TableField(exist = false) private String dutyTeamInfoName; diff --git a/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java b/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java index 17feacb94..e5f569ea0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java @@ -73,4 +73,9 @@ 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; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/entity/StableWaterMixStationDev.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/entity/StableWaterMixStationDev.java index 9846beb16..0f4e9b0fc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/stablewater/entity/StableWaterMixStationDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/entity/StableWaterMixStationDev.java @@ -113,4 +113,9 @@ 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; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardDev.java b/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardDev.java index e5bbccec9..1516dcf76 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardDev.java +++ b/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,11 @@ public class StandardDev implements Serializable { @Excel(name = "设备实时温度", width = 15) @ApiModelProperty(value="设备实时温度") private java.lang.String devTemperature ; - + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value="项目名称") private java.lang.String projectName ; diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java index be526b8ea..a2f9a3f5d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java @@ -103,7 +103,11 @@ public class UniversalTestDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; - + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "试验总次数") private Integer testTotalNum; diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java index be92cb56c..85c8aada9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java @@ -103,6 +103,11 @@ public class VehiclePositionDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "新增时间") private java.util.Date addTime; + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @TableField(exist = false) @ApiModelProperty(value = "在线状态(0.离线 1.在线)") diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/UfaceDev.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/UfaceDev.java index b135cae36..d81d39e6d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/UfaceDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/UfaceDev.java @@ -136,7 +136,11 @@ public class UfaceDev implements Serializable { @Excel(name = "设备位置归属,1工地区,2生活区,3项目部", width = 15) @ApiModelProperty(value = "设备位置归属,1工地区,2生活区,3项目部") private java.lang.Integer devGroupType; - + /** + * 合作单位id + */ + @ApiModelProperty(value = "合作单位id") + private java.lang.String enterpriseId; @ApiModelProperty(value = "设备状态1在线0离线") @TableField(exist = false) private java.lang.Integer devOnline;