修改文件冲突问题

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Apr 07 15:04:31 CST 2021
+#Wed Apr 14 16:48:32 CST 2021
 gradle.version=4.4

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/WatchContactsVO.java

@@ -1,17 +1,7 @@
 package com.wdkl.ncs.android.middleware.model.vo;
 
 import com.wdkl.ncs.android.middleware.model.annotation.Column;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-import java.io.Serializable;
-
-=======
->>>>>>> parent of f5f16a1... 修改
-=======
 import java.io.Serializable;
-
->>>>>>> 170213061e8027575b3fdb4d55c60c31e06a1ba7
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -21,15 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @create: 2021/04/07 16:30
  */
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-public class WatchContactsVO implements Serializable {
-=======
-public class WatchContactsVO {
->>>>>>> parent of f5f16a1... 修改
-=======
 public class WatchContactsVO implements Serializable {
->>>>>>> 170213061e8027575b3fdb4d55c60c31e06a1ba7
 
     @Column(name = "device_id")
     @ApiModelProperty(name = "device_id", value = "设备id", hidden = false)