From dad32aa4514963b724bf4c930212e61053fdd958 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 07 四月 2026 08:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phyz-spring3.5

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java
index deea115..e952e26 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java
@@ -29,4 +29,5 @@
     private String saleUserName;
     private String customerId;
     private String customerName;
+    private String stockOrgName;
 }

--
Gitblit v1.9.1