Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryDictResultDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.project.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,12 +32,10 @@ public class ProjectCategoryDictResultDTO implements Serializable {
     /**
      * 主键
      **/
-    @JsonIgnore
     private String id;
 
     /**
      * 上级分类ID 顶级此列存储0
      **/
-    @JsonIgnore
     private String pid;
 }