From b143fe586d7be6c12ec162bf5aebb3a99bff7e32 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 九月 2023 08:48:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/MainProcess.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index fd0a689..6aa5829 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -67,9 +67,12 @@
// mainService.outOfDevp();
//鍚姩銆佸畬鎴愩�佹殏鍋滄祴璇曠郴缁熸祴璇�
- mainService.packTest();
+ mainService.packTest1();
// //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶�
-// mainService.fierCrn();
+ mainService.fierCrn();
+
+ //103绔欑偣鏈夌墿涓嬪彂pack鐮�
+ mainService.packDevp();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1