CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
闫阳 2023-03-23 16:48:37 +08:00
commit b6e61961f7
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ym-admin/src/main/resources/mapper/SysDeptDao.xml
View File

@ -23,7 +23,7 @@
</select> </select>
<select id="getIdAndPidList" resultType="com.cnbm.admin.entity.SysDeptEntity"> <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>
<select id="getSubDeptIdList" resultType="long"> <select id="getSubDeptIdList" resultType="long">

2
ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
View File

@ -205,7 +205,7 @@ public class KukaJoinThread implements ApplicationRunner {
@Override @Override
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
//
// kukaStep1.scheduleAtFixedRate(new Runnable() { // kukaStep1.scheduleAtFixedRate(new Runnable() {
// @Override // @Override
// public void run() { // public void run() {

2
ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
View File

@ -15,8 +15,6 @@ public class PowerReportVo {
private Float totalLevelPower; //档位功率汇总 private Float totalLevelPower; //档位功率汇总
private Float totalCompensatePower; //补偿功率汇总 private Float totalCompensatePower; //补偿功率汇总
private Float diversePower; //差异功率汇总 private Float diversePower; //差异功率汇总
private List<PowerReportDTO> powerReports; private List<PowerReportDTO> powerReports;
} }