# Conflicts: # psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java # psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml # psdc-web/src/main/java/com/psdc/controller/control/ManualControl.java