Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java
# op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java
# op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java
# op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java
# op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
# op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java
|
wws
A0010407