Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/DictListResultDTO.java

@@ -1,6 +1,5 @@
 package com.epmet.commons.tools.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,7 +14,6 @@ public class DictListResultDTO implements Serializable {
     private static final long serialVersionUID = 8618231166600518980L;
     private String label;
     private String value;
-    @JsonIgnore
     private String pValue;
     private List<DictListResultDTO> children;
 }