From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index 3c9fddd..9cc27fa 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -85,7 +85,7 @@
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
+ 1, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
@@ -186,7 +186,7 @@
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
+ 1, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
--
Gitblit v1.9.1