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 308492d614 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.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 质量过程巡检+来料检验任务接口+报工sql调整 2 years ago
op-open OA提交字段注释 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.4 2 years ago
pom.xml 新增接口服务,去掉scada服务 2 years ago