From f24e61e9b0d8efc55f974bbec25fb0fb73b04ece Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 10 Jul 2021 14:18:57 +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 |   17 +++++++++++++----
 1 files changed, 13 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 905a230..0fb5aa2 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -58,7 +58,7 @@
     /**
      * 会员信息迁移
      */
-//    @Test
+    //@Test
     public void vipInfoMoveTest() {
         dataMove.vipInfoNew(dataMove.vipInfoOld());
     }
@@ -91,6 +91,8 @@
      * 充值卡
      * 套餐
      * 综合卡
+     *
+     *  ALTER TABLE `hive_test_meidu`.`shopping_goods` MODIFY COLUMN `is_once` int(10) NULL DEFAULT NULL AFTER `is_present`;
      */
 //    @Test
     public void shoppingGoodsMoveTest() {
@@ -122,17 +124,17 @@
         dataMove.shopStaffInfoNew(dataMove.shopStaffInfoOld());
     }
 
-//    @Test
+ //   @Test
     public void orderMoveTest() {
         dataMove.orderNew(dataMove.orderOld());
     }
 
-//    @Test
+   @Test
     public void bedInfoMoveTest() {
         dataMove.bedInfoNew(dataMove.bedInfoOld());
     }
 
-//    @Test
+    @Test
     public void projUseMoveTest() {
         dataMove.projUseNew(dataMove.projUseMoveOld());
     }
@@ -151,4 +153,11 @@
     public void tyOrderAndAchieveDataTest() {
         dataMove.tyOrderAndAchieveMove();
     }
+
+    @Test
+    public void roleUpdateTest() {
+//        dataMove.roleNew(dataMove.roleOld());
+
+        dataMove.roleNew2(dataMove.roleOld2());
+    }
 }

--
Gitblit v1.9.1