diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectUfaceConfig.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectUfaceConfig.java index a5f50774d..0a00209a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectUfaceConfig.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectUfaceConfig.java @@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="ProjectUfaceConfig实体类",description="ProjectUfaceConfig") public class ProjectUfaceConfig implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") @@ -31,9 +31,7 @@ public class ProjectUfaceConfig implements Serializable { @Excel(name = "项目SN", width = 15) @ApiModelProperty(value="项目SN") private java.lang.String projectSn; - /**1杭州宇泛智能科技,2用jdpush推送,3.mqtt,4.芊熠智能*/ - @Excel(name = "1杭州宇泛智能科技,2用jdpush推送,3.mqtt,4.芊熠智能,5佳信捷,6佳信捷新设备", width = 15) - @ApiModelProperty(value="1杭州宇泛智能科技,2用jdpush推送,3.mqtt,4.芊熠智能,5佳信捷,6佳信捷新设备") + @ApiModelProperty(value = "1杭州宇泛智能科技,2用jdpush推送,3.mqtt,4.芊熠智能,5佳信捷,6佳信捷新设备,7海康门禁") private java.lang.Integer supplierType; /**项目应用Id*/ @Excel(name = "项目应用Id", width = 15) 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 ea1256dc5..3ba6d22ed 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 @@ -330,6 +330,9 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl