Merge branch 'master-jb' of http://192.168.1.22:3000/Middleware/cn-data-platform into master-jb

# Conflicts:
#	algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataOnlineRateServiceImpl.java

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/PqsCommunicateDto.java

@@ -17,6 +17,7 @@ public class PqsCommunicateDto {
 
     private String description;
 
+    //1是在线 0是离线
     private Integer type;
     //是否更新updateTime标志；数据上送更新1，状态翻转不更新0
     private Integer flag=0;