# Conflicts: # psdc-admin/src/main/java/com/psdc/PsdcApplication.java # psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java # psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
