Merge branch 'lingshan_master' into dev

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java

@@ -13,6 +13,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class LingShanScreenServiceRstDTO {
+    private String id;
     private String content;
     private String applicantName;
     private String applicantMobile;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java

@@ -524,7 +524,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
             //         d.setApplicantHomeAddress(resiUserGridInfo.getGridName());
             //     }
             // }
-
+            d.setId(rec.getId());
             d.setContent(rec.getContent());
             d.setExceptServeAddress(rec.getExceptServeAddress());
             d.setExceptServeTime(rec.getExceptServeTime());