解决冲突

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/MileagePartDTO.java

@@ -1,19 +0,0 @@
-package org.springblade.business.dto;
-
-import lombok.Data;
-
-/**
- * @author yangyj
- * @Date 2022/6/10 16:28
- * @description TODO
- */
-@Data
-public class MileagePartDto {
-    private String id;
-    private String name;
-    private String prefix;
-    private String remark;
-    private String contractId;
-    private String projectId;
-    private Integer sort;
-}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/MileagePartDto.java

@@ -8,7 +8,7 @@ import lombok.Data;
  * @description TODO
  */
 @Data
-public class MileagePartDTO {
+public class MileagePartDto {
     private String id;
     private String name;
     private String prefix;