From 282b9a820fab24e7ab1f23d146834de618e101ff Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 九月 2023 09:29:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

---
 src/main/java/com/zy/core/MainProcess.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ba3b5f1..6aa5829 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -64,11 +64,15 @@
 //                    mainService.ledExecute();
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
 //                    mainService.ledReset();
+//                    mainService.outOfDevp();
 
-                    mainService.outOfDevp();
+                    //鍚姩銆佸畬鎴愩�佹殏鍋滄祴璇曠郴缁熸祴璇�
+                    mainService.packTest1();
+//                    //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶�
+                    mainService.fierCrn();
 
-                    //鍚姩娴嬭瘯绯荤粺娴嬭瘯
-                    mainService.startTest();
+                    //103绔欑偣鏈夌墿涓嬪彂pack鐮�
+                    mainService.packDevp();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1