Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4

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">

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() {

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;
 
-
 }