Merge remote-tracking branch 'origin/master'

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java

@@ -501,6 +501,7 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl<StAlarmRecordMapper
 					iter.setServeType(stationEntity.getServeType());
 				}
 				iter.setContent(iter.getSoeExplain());
+				iter.setType(iter.getSoeType());
 				iter.setSoeType(array[Integer.valueOf(iter.getSoeType())]);
 			}
 		}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/vo/SoeDataVo.java

@@ -24,4 +24,6 @@ public class SoeDataVo extends SoeData {
 
 	private String serveType;
 
+	private String type;
+
 }