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.

Yangwl 6fb697e5ca Merge remote-tracking branch 'origin/master' ... # Conflicts: # op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java # op-auth/src/main/resources/bootstrap.yml # op-gateway/src/main/resources/bootstrap.yml # op-modules/op-mes/push-mes.bat # op-modules/op-mes/src/main/resources/bootstrap.yml # op-modules/op-sap/src/main/resources/bootstrap.yml # op-modules/op-system/src/main/resources/bootstrap.yml		2 years ago
..
op-device	计划新增-parentCode存放上级id	2 years ago
op-energy	测试版本注册中心修改	2 years ago
op-file	测试版本注册中心修改	2 years ago
op-gen	测试版本注册中心修改	2 years ago
op-job	成品bug修改	2 years ago
op-mes	Merge remote-tracking branch 'origin/master'	2 years ago
op-open	成品bug修改	2 years ago
op-plan	成品bug修改	2 years ago
op-quality	bat换jdk	2 years ago
op-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	bat换jdk	2 years ago
pom.xml	新增接口服务，去掉scada服务	2 years ago