Merge remote-tracking branch 'origin/wms_dev' into wms_dev

2026-01-27 17:23:22 +08:00
parent 76fff6437d 0738c939ae
commit 277dc19988
14 changed files with 1056 additions and 88 deletions
@@ -20,6 +20,9 @@ public class StockInOrderImportRowDTO {
    // @Excel(name = "货主ID")
    // private Long shipperId;

+    @Excel(name = "货主编号")
+    private String shipperCode;
+
    // @Excel(name = "供应商ID")
    // private Long supplierId;

@@ -68,7 +71,7 @@ public class StockInOrderImportRowDTO {

    // 客户名称只在表头中，明细行不需要此字段（代码会从表头读取并应用到此字段）
    @Excel(name = "客户名称")
-    private String customerName;
+    private String shipperName;

    @Excel(name = "承运商")
    private String carrier;