Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

app/controllers/projects_controller.rb

@@ -366,7 +366,7 @@ class ProjectsController < ApplicationController
         if @project_detail.save!
           attachment_ids = Array(params[:attachment_ids])
           logger.info "=============> #{Array(params[:attachment_ids])}"
-          @attachments = Attachment.where(id: attachment_ids)
+          @attachments = Attachment.where(id: attachment_ids).or(Attachment.where(uuid: attachment_ids))
           @attachments.update_all(
             container_id: @project_detail.id,
             container_type: @project_detail.model_name.name,