diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SafetyPerformanceAnalysisVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SafetyPerformanceAnalysisVo.java index 27420ba90..bf5bfe9e0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SafetyPerformanceAnalysisVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SafetyPerformanceAnalysisVo.java @@ -27,6 +27,7 @@ public class SafetyPerformanceAnalysisVo { private Integer jlNotPerformNum; @ApiModelProperty("监理在职总数") private Integer jlInServiceNum; - + @ApiModelProperty(value = "企业名称") + private java.lang.String enterpriseName; private List list; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml index 1e656bf0f..088411c0a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml @@ -827,6 +827,7 @@