From 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 24 Apr 2021 20:21:24 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
zq-erp/src/test/java/com/matrix/DataMoveTest.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/DataMoveTest.java b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
index 93f0bb9..70cf3f8 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -29,7 +29,7 @@
/**
* 商铺信息迁移
*/
- @Test
+// @Test
public void slaveTest() {
List<SysShopInfo> shopInfos = dataMove.oldShopInfo();
dataMove.toNewShopInfo(shopInfos);
@@ -40,7 +40,7 @@
* @throws UnsupportedEncodingException
* @throws NoSuchAlgorithmException
*/
- @Test
+// @Test
public void sysUsersMoveTest() throws UnsupportedEncodingException, NoSuchAlgorithmException {
List<SysUsers> sysUsers = dataMove.oldSysUsers();
dataMove.newSysUsers(sysUsers);
@@ -122,7 +122,7 @@
dataMove.shopStaffInfoNew(dataMove.shopStaffInfoOld());
}
-// @Test
+ @Test
public void orderMoveTest() {
dataMove.orderNew(dataMove.orderOld());
}
@@ -142,8 +142,13 @@
dataMove.serviceOrderNew(dataMove.serviceOrderOld());
}
-
+ @Test
public void moneyCardUseMoveTest() {
dataMove.moneyCardUseNew(dataMove.moneyCardUseOld());
}
+
+ @Test
+ public void tyOrderAndAchieveDataTest() {
+ dataMove.tyOrderAndAchieveMove();
+ }
}
--
Gitblit v1.9.1