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 f2a49bc24e Merge remote-tracking branch 'origin/master' ... # Conflicts: # op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java # op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java # op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java # op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java # op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml		2 years ago
..
op-device	微服务添加	2 years ago
op-energy	微服务添加	2 years ago
op-file	计划涉及的接口开发	2 years ago
op-gen	计划涉及的接口开发	2 years ago
op-job	SAP模块提交订单同步操作	2 years ago
op-mes	计划涉及的接口开发	2 years ago
op-plan	Merge remote-tracking branch 'origin/master'	2 years ago
op-quality	微服务添加	2 years ago
op-sap	SAP模块增加时间参数	2 years ago
op-scada	微服务添加	2 years ago
op-security	微服务添加	2 years ago
op-system	计划涉及的接口开发	2 years ago
op-technology	计划涉及的接口开发	2 years ago
op-wms	基础信息后端BOM更改	2 years ago
op-modules.iml	init	2 years ago
pom.xml	微服务添加	2 years ago