rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/bug-764' into develop 

# Conflicts:
#	nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
This commit is contained in:
曹鹏飞 2025-10-10 17:07:49 +08:00
parent 6226770de9 0b399d3ef6
commit d4121b1e6d
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InMaterialScanRecord.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.admin.pojo.document; package com.nflg.wms.admin.pojo.document;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
@ -113,6 +114,7 @@ public class InMaterialScanRecord {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Instant createTime; private Instant createTime;
@Transient @Transient

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InventoryCheckTaskScanRecord.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.admin.pojo.document; package com.nflg.wms.admin.pojo.document;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -76,5 +77,6 @@ public class InventoryCheckTaskScanRecord {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Instant createTime; private Instant createTime;
} }

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/OutMaterialScanRecord.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.admin.pojo.document; package com.nflg.wms.admin.pojo.document;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
@ -112,6 +113,7 @@ public class OutMaterialScanRecord {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Instant createTime; private Instant createTime;
@Transient @Transient

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.admin.pojo.document; package com.nflg.wms.admin.pojo.document;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
@ -79,5 +80,6 @@ public class PackageMaterialScanRecord {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Instant createTime; private Instant createTime;
} }