Browse Source

数据处理

chengyao 4 years ago
parent
commit
60bd2e65ee
1 changed files with 1 additions and 3 deletions
  1. 1 3
      src/main/java/com/diagbot/web/ADataStrController.java

+ 1 - 3
src/main/java/com/diagbot/web/ADataStrController.java

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