This commit improves the conflict resolution logic when moving or copying files and folders. Instead of checking for conflicts against the ProviderEntry field only, it now also checks the FileConflictResolveType. This change helps to better handle occurrences of duplicate files or folders and to skip certain items as required by the conflict resolution type. Additionally, an empty folders check is included in FolderDao to avoid unnecessary operations.

Two member variables, FileEntryType, were added to two models: FileDto and FolderDto. This type designation simplifies and clarifies the distinction between file and folder entries within these data transfer objects. Additionally, an abstract FileEntryType was added to the FileEntryDto class.

The code previously assigned an empty string to the result on conflict. Now, it correctly assigns the folder ID to ensure proper handling and consistency. This change corrects a logical error that could cause issues in folder management.

Revised the conflict handling to simplify the logic by removing unnecessary checks for the Skip resolution type. The condition now specifically checks for the Overwrite type when processing folders. This change streamlines the code and increases readability.

# Conflicts:
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs

# Conflicts:
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs