数据处理

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

@@ -252,7 +252,5 @@ public class ADataStrController {
     }
 
 }
-<<<<<<< HEAD
-=======
 */
->>>>>>> dev/20201224_2.0.0
+