# Conflicts:
#	dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java
#	dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryService.java
#	dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java
#	dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java