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.
mengjiao 74032decd5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
2 years ago
..
op-device 看板接口便变更 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 质量看板接口修改3 2 years ago
op-plan 质量质检+工单管理界面加入母单信息+首页图表 2 years ago
op-quality 质量质检+工单管理界面加入母单信息+首页图表 2 years ago
op-sap wms修改9.2 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 wms修改9.2 2 years ago
pom.xml 新增接口服务,去掉scada服务 2 years ago