From 1258751c10cd095434a918d5c7679d55a344cc33 Mon Sep 17 00:00:00 2001
From: caixiang <939387484@qq.com>
Date: Tue, 21 Mar 2023 16:47:35 +0800
Subject: [PATCH 1/2] commit for pull

---
 ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java b/ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
index 52c00f2..1a877e2 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
@@ -15,8 +15,6 @@ public class PowerReportVo {
     private Float totalLevelPower;   //档位功率汇总
     private Float totalCompensatePower;  //补偿功率汇总
     private Float diversePower;  //差异功率汇总
-
     private List<PowerReportDTO> powerReports;
 
-
 }

From 7789d2b1ab1c998c75559144838d9e8271d5440d Mon Sep 17 00:00:00 2001
From: caixiang <939387484@qq.com>
Date: Wed, 22 Mar 2023 14:12:37 +0800
Subject: [PATCH 2/2] commit

---
 ym-admin/src/main/resources/mapper/SysDeptDao.xml              | 2 +-
 ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ym-admin/src/main/resources/mapper/SysDeptDao.xml b/ym-admin/src/main/resources/mapper/SysDeptDao.xml
index 5101128..d2fd93d 100644
--- a/ym-admin/src/main/resources/mapper/SysDeptDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysDeptDao.xml
@@ -23,7 +23,7 @@
 	</select>
 
 	<select id="getIdAndPidList" resultType="com.cnbm.admin.entity.SysDeptEntity">
-		select t1.id, t1.pid from sys_dept t1  AND t1.valid = 1
+		select t1.id, t1.pid from sys_dept t1 where t1.valid = 1
 	</select>
 
 	<select id="getSubDeptIdList" resultType="long">
diff --git a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
index 75d92ac..c8e357f 100644
--- a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
+++ b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
@@ -205,7 +205,7 @@ public class KukaJoinThread implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-//
+
 //        kukaStep1.scheduleAtFixedRate(new Runnable() {
 //            @Override
 //            public void run() {