merge

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -242,7 +242,7 @@ public class OrderGoodsVO {
     private Integer alreadyTransportTruckAmount;
 
 
-    @ApiModelProperty(value = "贸易商名称")
+    @Schema(description= "贸易商名称")
     private String cooperativeCompaniesName;
 
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/PerformanceProgressVO.java

@@ -95,7 +95,7 @@ public class PerformanceProgressVO{
     @Schema(description="挂单吨数")
     private BigDecimal pendingWeight;
 
-    @ApiModelProperty("挂单车数")
+    @Schema(description = "挂单车数")
     private Integer pendingTruck;
 
     

performance-web/src/main/java/com/clx/performance/controller/temp/TempFeignController.java

@@ -2,7 +2,7 @@ package com.clx.performance.controller.temp;
 
 import com.clx.order.feign.OrderFeign;
 import com.msl.common.result.Result;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +23,8 @@ public class TempFeignController {
 
     private OrderFeign orderFeign;
 
-    @ApiOperation(value = "测试feign", notes = "<br>By:刘海泉")
+
+    @Operation(summary = "测试feign", description = "<br>By:刘海泉")
     @GetMapping("/replaceFeignHttp")
     public Result<Object> replaceFeignHttp() {
 

performance-web/src/main/java/com/clx/performance/model/PerformanceProgress.java

@@ -99,7 +99,7 @@ public class PerformanceProgress implements HasKey<Integer> {
 
 
     @TableField("pending_truck")
-    @ApiModelProperty("挂单车数")
+    @Schema(description="挂单车数")
     private Integer pendingTruck;