From 042735c4d44e740121dbbb52257617d348a1c391 Mon Sep 17 00:00:00 2001
From: fuyu <fuyu@prec-tech.com>
Date: 星期一, 06 三月 2023 13:39:38 +0800
Subject: [PATCH] Merge branch '进口单证+obsap+导入'
---
force-app/main/default/classes/DealerPersonnelControllerTest.cls | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/DealerPersonnelControllerTest.cls b/force-app/main/default/classes/DealerPersonnelControllerTest.cls
index e4c04c4..5426dbf 100644
--- a/force-app/main/default/classes/DealerPersonnelControllerTest.cls
+++ b/force-app/main/default/classes/DealerPersonnelControllerTest.cls
@@ -9,6 +9,9 @@
}
@isTest public static void selectProductCcategoryTest() {
Test.startTest();
+<<<<<<< HEAD
+ String reports = DealerPersonnelController.processData('"濮撳悕,鎵嬫満,鐢靛瓙閭欢,缁忛攢鍟嗙紪鐮�,瀹㈡埛鍚�,缁忛攢鍟嗙敤鎴�,浜哄憳绠＄悊缂栫爜,缁忛攢鍟嗕笓鍛樼被鍨�,鍏ヨ亴骞翠唤,GIR璁よ瘉绾у埆,GIR璁よ瘉鏃堕棿,SP璁よ瘉绾у埆,SP璁よ瘉鏃堕棿,ET璁よ瘉绾у埆,ET璁よ瘉鏃堕棿,ENG璁よ瘉绾у埆,ENG璁よ瘉鏃堕棿\r\n灏忕帇,18801332211,123@qq.com,737011,鍚ǔ璧锋,TRUE,C000125941,SP涓撳憳,2021/1/7,A,2022/1/7,A,2019/1/7,A,2021/2/7,B,2020/1/7\r\n','',null);
+=======
testInit();
String reports = DealerPersonnelController.processData('"濮撳悕,鎵嬫満,鐢靛瓙閭欢,缁忛攢鍟嗙紪鐮�,瀹㈡埛鍚�,缁忛攢鍟嗙敤鎴�,浜哄憳绠＄悊缂栫爜,缁忛攢鍟嗕笓鍛樼被鍨�,鍏ヨ亴骞翠唤,GIR璁よ瘉绾у埆,GIR璁よ瘉鏃堕棿,SP璁よ瘉绾у埆,SP璁よ瘉鏃堕棿,ET璁よ瘉绾у埆,ET璁よ瘉鏃堕棿,ENG璁よ瘉绾у埆,ENG璁よ瘉鏃堕棿\r\n灏忕帇,18801332211,123@qq.com,737011,鍚ǔ璧锋,TRUE,C000125941,SP涓撳憳,2021/1/7,A,2022/1/7,A,2019/1/7,A,2021/2/7,B,2020/1/7\r\n','',null);
String reports2 = DealerPersonnelController.processData('"濮撳悕,鎵嬫満,鐢靛瓙閭欢,缁忛攢鍟嗙紪鐮�,瀹㈡埛鍚�,缁忛攢鍟嗙敤鎴�,浜哄憳绠＄悊缂栫爜,缁忛攢鍟嗕笓鍛樼被鍨�,鍏ヨ亴骞翠唤,GIR璁よ瘉绾у埆,GIR璁よ瘉鏃堕棿,SP璁よ瘉绾у埆,SP璁よ瘉鏃堕棿,ET璁よ瘉绾у埆,ET璁よ瘉鏃堕棿,ENG璁よ瘉绾у埆,ENG璁よ瘉鏃堕棿\r\n灏忕帇,18801332211,123@qq.com,737011,test1鍖婚櫌,TRUE,,SP涓撳憳,2021/1/7,A绾�,2022/1/7,A绾�,2019/1/7,A绾�,2021/2/7,B绾�,2020/1/7\r\n','',null);
@@ -16,6 +19,7 @@
DealerPersonnelController.updateContact(data);
Boolean a= DealerPersonnelController.VerificationDateType('');
Date b = DealerPersonnelController.ConversionDateType('');
+>>>>>>> 杩涘彛鍗曡瘉+obsap+瀵煎叆
Test.stopTest();
}
@isTest public static void selectProductCcategoryTest01() {
--
Gitblit v1.9.1