From 64d18ce2ffd7b63ee06e9b42dbeaf6ce4a337495 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 13 九月 2022 16:37:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/ProductHistoryService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductHistoryService.java b/src/main/java/com/whyc/service/ProductHistoryService.java
index 1c04da7..91c6366 100644
--- a/src/main/java/com/whyc/service/ProductHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductHistoryService.java
@@ -83,7 +83,7 @@
}
//鍘嗗彶鐗堟湰鍙敤鎬ц瀹�
@Transactional
- public Response setpHistoryEnable(String parentCode, String customCode, int version, int enabled, String reason) {
+ public Response setpHistoryEnable(String parentCode, String customCode, int version, int enabled, String reason, String versionTime) {
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("parent_code",parentCode);
wrapper.eq("custom_code",customCode);
@@ -166,6 +166,7 @@
lockLog.setParentCode(parentCode);
lockLog.setCustomCode(customCode);
lockLog.setVersion(version);
+ lockLog.setVersionTime(versionTime);
lockLog.setReason(reason);
lockLog.setOwner(ActionUtil.getUser().getName());
lockLog.setCreateTime(new Date());
--
Gitblit v1.9.1