From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/service/IMasterModifiedService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/IMasterModifiedService.java b/src/main/java/com/highdatas/mdm/service/IMasterModifiedService.java
index 4b440e3..ba60234 100644
--- a/src/main/java/com/highdatas/mdm/service/IMasterModifiedService.java
+++ b/src/main/java/com/highdatas/mdm/service/IMasterModifiedService.java
@@ -1,5 +1,7 @@
package com.highdatas.mdm.service;
+import com.highdatas.mdm.pojo.ActivitiStatus;
+
import java.util.List;
import java.util.Map;
@@ -17,6 +19,9 @@
List<Map<String,String>> getModifiedUserByIds(String maintainId, List<String> masterId);
- boolean updateModifiedUserById(String maintainId, String masterId, List<String> modifiedFieldList);
+ boolean updateModifiedUserById(String maintainId, String masterId, String userId, List<String> modifiedFieldList);
+ void dealFlow(String maintainId, ActivitiStatus status);
+
+ void dealAssemble(String maintainId, String userId, boolean audit);
}
--
Gitblit v1.8.0