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 9034a8188c Merge remote-tracking branch 'origin/master' ... # Conflicts: # op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.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	sap接口调整	2 years ago
op-mes	sap报工-状态	2 years ago
op-open	sap报工	2 years ago
op-plan	sap报工	2 years ago
op-quality	sap报工	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	Merge remote-tracking branch 'origin/master'	2 years ago
pom.xml	新增接口服务，去掉scada服务	2 years ago