Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

2026-01-10 16:55:59 +08:00
parent 2989878d17 0a427866bd
commit e7e4d8c1c5
2 changed files with 2 additions and 2 deletions
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
@@ -61,7 +61,7 @@ public class WmsMaterialCoilExportVo {
     * 日期
     */
    @ExcelProperty(value = "日期")
-    private Date updateTime;
+    private Date createTime;

    /**
     * 重量（kg）
--- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
@@ -360,7 +360,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            -- 成品卷号
            mc.current_coil_no AS currentCoilNo,
            -- 日期
-            mc.update_time AS updateTime,
+            mc.create_time AS createTime,
            -- 重量
            mc.net_weight AS netWeight,
            -- 长度