解决冲突

inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/domain/PatrolPresetPos.java

@@ -30,7 +30,6 @@ public class PatrolPresetPos extends BaseEntity {
 
     @JsonProperty("patrolpointId")
 //    @JsonAlias({"patrolPointId"})
-    @JsonProperty("patrolpointId")
     private Long patrolPointId;
     @Excel(
             name = "通道ID"
@@ -60,7 +59,6 @@ public class PatrolPresetPos extends BaseEntity {
     private String algSubtypeCode;
     @JsonProperty("eqpbookId")
 //    @JsonAlias({"eqpBookId"})
-    @JsonProperty("eqpbookId")
     private String eqpBookId;
     private String channelCode;
     private String channelType;