Merge branch 'dev/20201224_2.0.0' into develop

# Conflicts:
#	src/main/java/com/diagbot/vo/AnalyzeRunVO.java
#	src/main/java/com/diagbot/web/ADataStrController.java

src/main/java/com/diagbot/vo/AnalyzeRunVO.java

@@ -22,6 +22,6 @@ public class AnalyzeRunVO {
     private Long modeId;
     // 归档字段
     private String isPlacefile = "0";
-    //默认分组
-    private Integer NeedGroup = 1;
+
+    private Integer NeedGroup = 0;
 }

src/main/java/com/diagbot/web/ADataStrController.java

@@ -1,3 +1,4 @@
+/*
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
@@ -251,3 +252,7 @@ public class ADataStrController {
     }
 
 }
+<<<<<<< HEAD
+=======
+*/
+>>>>>>> dev/20201224_2.0.0