Merge branch 'lingshan_master' into dev

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

@@ -5,7 +5,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.security.PrivateKey;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -50,8 +49,8 @@ public class LingShanScreenServiceRstDTO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class ProcessNode {
-        private Integer processType;
+        private Integer processStatus;
-        private String processTypeName;
+        private String processStatusName;
         private String processorName;
         private String processDesc;
         private List<String> processAttachments = new ArrayList<>();

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java

@@ -31,5 +31,6 @@ public class ResiImportDyzxhPostProcessor extends ResiImportPostProcessor{
         form.setMessageType(SystemMessageType.IC_RESI_USER_ADD);
         form.setContent(mqMsg);
         epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+
     }
 }