From 8bba7f03df59c7689dbb64a952a63944a1f43ade Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 30 六月 2023 16:05:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
index f7e5585..50a29a8 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
@@ -19,6 +19,7 @@
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -204,9 +205,7 @@
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
- data.setCompleteTime(new Date());
data.setType(type);
- data.setIntelCard("0000");
data.setRegisterUser(user.getCname());
data.setDeptId(ContextUtil.subDeptId(user));
data.setCheckUser(user.getCname());
--
Gitblit v1.9.3