diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsPageVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsPageVO.java index bc3de4b..5b3752e 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsPageVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsPageVO.java @@ -31,7 +31,8 @@ public class CsPageVO { private String pid; @ApiModelProperty(value="前端使用") - private String kid; + private String kId; + @ApiModelProperty(value="组态项目名称") private String configurationName; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java index 9da895e..e0f74e8 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java @@ -123,7 +123,7 @@ public class CsPagePOServiceImpl extends ServiceImpl i CsPageVO csPageVO = new CsPageVO(); CsConfigurationPO csConfigurationPO = csConfigurationMapper.selectById(temp.getPid()); BeanUtils.copyProperties(temp, csPageVO); - csPageVO.setKid(temp.getKId()); + csPageVO.setKId(temp.getKId()); csPageVO.setConfigurationName(csConfigurationPO.getName()); InputStream fileStream = fileStorageUtil.getFileStream(temp.getPath()); String text = new BufferedReader(