From e828d99f25ba6736cdb0c31128aa4d976348bcb3 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期三, 12 十月 2022 17:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

---
 src/main/java/com/zy/core/MainProcess.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 48dcaa0..52de28e 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -67,11 +67,10 @@
 
                     mainService.outOfDevp();
 
-                    //鍚姩娴嬭瘯绯荤粺娴嬭瘯
-                    mainService.startTest();
-
-                    //娴嬭瘯绯荤粺瀹屾垚娴嬭瘯纭
-                    mainService.finishTest();
+                    //鍚姩銆佸畬鎴愩�佹殏鍋滄祴璇曠郴缁熸祴璇�
+                    mainService.packTest();
+                    //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶�
+                    mainService.fierCrn();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1