From 14f6548120b5d7f58ae2082454508a26ddac1db8 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 25 二月 2026 14:01:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java
index 1b14fbd..a32b861 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java
@@ -5,6 +5,7 @@
@Data
public class InOrderAndItem {
+ private Long id;
private String poCode;
private String type;
private String wkType$;
@@ -22,7 +23,7 @@
private String anfme;
private String qty;
private String targetWarehouseId;
- private String username;
- private String createTime;
+ private String updateBy;
+ private String updateTime;
}
--
Gitblit v1.9.1