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 cf661ceb8..a16033ad7 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 @@ -81,11 +81,12 @@ public class PitchMixStationDev implements Serializable { @ApiModelProperty(value = "拌合站位置") private java.lang.String mixingStationLocation; /** - * 负责人 + * 负责人id */ - @Excel(name = "负责人", width = 15) - @ApiModelProperty(value = "负责人") - private java.lang.String personInCharge; + @ApiModelProperty(value = "负责人id") + private java.lang.Long dutyUserId; + @ApiModelProperty(value = "负责人名称") + private java.lang.String dutyUserName; /** * 负责人电话 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java index 7d8b7988a..6410ea471 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java @@ -302,10 +302,14 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl