1.数据更新推送添加 ...

2.任务结束推送添加

1.更改算法目录

现场调试代码提交

Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev ...

Conflicts:

	casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java

导出提交

1.增加推送栅格信息

1.下发寻点任务接口添加 ...

2.任务模式设置接口添加

1.巡检任务变更

1.日志输出优化

1.栅格裁剪更新

1.算法对接调整

1.算法对接调整

Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev ...

Conflicts:

	casic-web/src/main/resources/config/application-dev.yml

增加 导出“TXT或EXCEL格式的一组数据（包括0~4096、MCA、PSD及PSD映射至MCA的四列）”接口

1.模板更新,算法对接调整

Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev ...

Conflicts:

	casic-web/src/main/resources/config/application-dev.yml

增加 导出“TXT或EXCEL格式的一组数据（包括0~4096、MCA、PSD及PSD映射至MCA的四列）”接口

1.定位算法调用增加线程池

Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev

拉代码

1.knif4j 异常修复

Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev ...

Conflicts:

	casic-server/src/main/java/com/casic/missiles/modular/constants/RobotDictConstants.java

1.机器人结束任务异常问题调试

class类重复命名修改

mac曲线 根据预置设置预阈值过滤功能提交

1.机器人调试

1.循迹相关代码提交

1.录包相关更新

psd数据推送优化提交

1.障碍物栅格上报更新