From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
index 34a268d..64a9d4a 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
@@ -8,7 +8,7 @@
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.m.service.HContractManageService;
import com.ld.igds.models.DicTrigger;
-import com.ld.igds.models.MContract;
+import com.ld.igds.models.InoutContract;
import com.ld.igds.sys.service.SysDeptService;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
@@ -88,10 +88,9 @@
@DataProvider
public List<DicTrigger> triggerContractType() {
List<DicTrigger> list = new ArrayList<DicTrigger>();
-
list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_1, "閿�鍞悎鍚�"));
list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_2, "閲囪喘鍚堝悓"));
- list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_3, "杞崲鍚堝悓"));
+ list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_3, "浠ｅ偍鍚堝悓"));
return list;
}
@@ -119,7 +118,7 @@
* @throws Exception
*/
@DataProvider
- public void pageContract(Page<MContract> page, Map<String, Object> param) throws Exception {
+ public void pageContract(Page<InoutContract> page, Map<String, Object> param) throws Exception {
if (null == param) {
param = new HashMap<String, Object>();
}
@@ -131,7 +130,7 @@
* @param data
*/
@DataResolver
- public void saveContract(MContract data) {
+ public void saveContract(InoutContract data) {
service.saveContract(data);
}
@@ -141,7 +140,7 @@
* @return
*/
@Expose
- public String delContract(MContract data) {
+ public String delContract(InoutContract data) {
return service.delContract(data);
}
}
--
Gitblit v1.9.3