From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-api/src/main/java/com/java110/api/bmo/store/IStoreBMO.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/store/IStoreBMO.java b/service-api/src/main/java/com/java110/api/bmo/store/IStoreBMO.java
index 36c7350..38f5a86 100644
--- a/service-api/src/main/java/com/java110/api/bmo/store/IStoreBMO.java
+++ b/service-api/src/main/java/com/java110/api/bmo/store/IStoreBMO.java
@@ -1,7 +1,12 @@
package com.java110.api.bmo.store;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.IApiBaseBMO;
+import com.java110.dto.workflow.WorkflowDto;
+import com.java110.po.workflow.WorkflowPo;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
/**
* @ClassName IStoreBMO
@@ -61,4 +66,15 @@
public JSONObject addCollection(JSONObject paramInJson);
+ JSONObject contractApply(JSONObject paramInJson);
+
+
+ /**
+ * 鍚堝悓鍙樻洿
+ *
+ * @param paramInJson
+ * @return
+ */
+ JSONObject contractChange(JSONObject paramInJson);
+
}
--
Gitblit v1.8.0