Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17

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

@@ -72,13 +72,10 @@ public class PendingFreight implements HasKey<Integer> {
     @Schema(description="货物名称")
     private String goodsName;
 
-    @TableField("goods_type_code")
-    @Schema(description="热值编码")
-    private String goodsTypeCode;
 
-    @TableField("goods_type_name")
+    @TableField("goods_model")
     @Schema(description="热值名称")
-    private String goodsTypeName;
+    private String goodsModel;
 
     @TableField("send_over_standard")
     @Schema(description="是否C类煤源  0 否  1 是")

clx-performance-web/src/main/java/com/clx/performance/service/impl/PendingFreightServiceImpl.java

@@ -75,8 +75,7 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
         item.setOrderStatus(data.getOrderStatus());
         item.setSendAddressId(data.getSendAddressId());
         item.setSendAddressShorter(data.getSendAddressShorter());
-        item.setGoodsTypeCode(data.getGoodsTypeCode());
-        item.setGoodsTypeName(data.getGoodsTypeName());
+        item.setGoodsModel(data.getGoodsModel());
         item.setGoodsNameId(data.getGoodsNameId());
         item.setGoodsName(data.getGoodsName());
         item.setSendOverStandard(data.getOverWeight());