Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

2026-03-11 15:21:37 +08:00
parent 71c7876bf9 fb96148d1f
commit 70b9d620b2
6 changed files with 809 additions and 14 deletions
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java
@@ -89,13 +89,13 @@ public class WmsCoilPendingActionBo extends BaseEntity {
    /**
     * 处理时间
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processTime;

    /**
     * 完成时间
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date completeTime;

    //开始时间和结束时间