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.
杨万里 37690ec696 Merge branch 'master' of http://1.13.177.47:3000/Yangwl/lanju-cloud
# Conflicts:
#	op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java
#	op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java
#	op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml
5 months ago
..
op-device 备品备件出入库优化2 7 months ago
op-energy 新增能耗补录接口 5 months ago
op-file 问题修复22 2 years ago
op-gen 巡检报表4 2 years ago
op-job 新增威伟电表修正定时任务 5 months ago
op-mes 物料损耗修改状态 5 months ago
op-open 新增对外缺陷类型查询接口 5 months ago
op-plan 生产工单报表排序调整 8 months ago
op-printservice 设备异常描述与设备类型绑定修改 1 year ago
op-quality Merge branch 'master' of http://1.13.177.47:3000/Yangwl/lanju-cloud 5 months ago
op-sap Merge remote-tracking branch 'origin/master' 5 months ago
op-security 开发配置还原 2 years ago
op-system 调整缓存时间 11 months ago
op-technology 工艺路线同步方法修改,抽样算法修改优化。 10 months ago
op-wms 恢复被覆盖的库存填报代码 5 months ago
pom.xml 新增lombok依赖 5 months ago