Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

module-his/module-his-biz/src/main/java/com/yc/ship/module/his/controller/admin/tradeorder/vo/TradeOrderRespVO.java

@@ -105,6 +105,10 @@ public class TradeOrderRespVO {
     @ExcelProperty("备注")
     private String remark;
 
+    @Schema(description = "计调备注")
+    @ExcelProperty("计调备注")
+    private String jdRemark;
+
     @Schema(description = "携程需要的", example = "891")
     @ExcelProperty("携程需要的")
     private String itemId;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespNewVO.java

@@ -89,6 +89,10 @@ public class TradeOrderRespNewVO {
     @ExcelProperty("备注")
     private String remark;
 
+    @Schema(description = "计调备注")
+    @ExcelProperty("计调备注")
+    private String jdRemark;
+
     @Schema(description = "销售来源", example = "31758")
     private String sourceId;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespVO.java

@@ -168,6 +168,11 @@ public class TradeOrderRespVO {
     @ExcelProperty("备注")
     private String remark;
 
+
+    @Schema(description = "计调备注")
+    @ExcelProperty("计调备注")
+    private String jdRemark;
+
     @Schema(description = "营销政策备注")
 //    @ExcelProperty("营销政策备注")
     private String auditRemark;