Merge remote-tracking branch '惠信/develop' into develop

2026-03-26 18:03:02 +08:00 · 2026-03-26 18:03:02 +08:00 · 1f7f54f5e6
parent bdf413e1c0 e77912c3c1
commit 1f7f54f5e6
1 changed files with 2 additions and 2 deletions
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/dto/DeliveryExportDTO.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/dto/DeliveryExportDTO.java
@ -21,9 +21,9 @@ public class DeliveryExportDTO {
    private String soNo;
    /**
-     * 设备料号
+     * 物料编码
     */
-    @ExcelColumn("设备料号")
+    @ExcelColumn("物料编码")
    private String materialNo;
    /**