You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

wws ec3f01dd84 Merge remote-tracking branch 'origin/master' ... # Conflicts: # op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java # op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java # op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java # op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java # op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml # op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java		2 years ago
..
op-device	Merge remote-tracking branch 'origin/master'	2 years ago
op-energy	update - 能源模块	2 years ago
op-file	测试版本注册中心修改	2 years ago
op-gen	测试版本注册中心修改	2 years ago
op-job	完好率统计报表、设备运行记录定时任务	2 years ago
op-mes	质量看板接口	2 years ago
op-open	质量看板接口修改	2 years ago
op-plan	Merge remote-tracking branch 'origin/master' into highway	2 years ago
op-quality	首页-各组线每月设备故障数、设备完好率修改BUG解决	2 years ago
op-sap	SAP的储位仓库信息接口	2 years ago
op-security	新增接口服务，去掉scada服务	2 years ago
op-system	Merge remote-tracking branch 'origin/master'	2 years ago
op-technology	换jdk	2 years ago
op-wms	故障信息四个页面	2 years ago
pom.xml	新增接口服务，去掉scada服务	2 years ago