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.
zhaoxiaolin e6aa70ba9f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
1 year ago
..
op-device 工时改小时 1 year ago
op-energy update - 能源模块 1 year ago
op-file 测试版本注册中心修改 1 year ago
op-gen 测试版本注册中心修改 1 year ago
op-job 质量过程巡检+来料检验任务接口 1 year ago
op-mes 报工界面美化一下 1 year ago
op-open 错误信息输出 1 year ago
op-plan 关闭订单暂时隐藏 1 year ago
op-quality Merge remote-tracking branch 'origin/master' 1 year ago
op-sap SAP订单物料过账修改 1 year ago
op-security 新增接口服务,去掉scada服务 1 year ago
op-system 数据源分配用户查询BUG解决 1 year ago
op-technology 换jdk 1 year ago
op-wms wms出库过账修改22--sap过账接口的修改 1 year ago
pom.xml 新增接口服务,去掉scada服务 1 year ago