Merge branch 'standalone_develop' into pm_project_develop

# Conflicts:
#	app/controllers/attachments_controller.rb
#	app/services/api/v1/issues/concerns/checkable.rb
#	app/services/api/v1/issues/concerns/loadable.rb

app/controllers/api/v1/issues/statues_controller.rb

@@ -4,7 +4,7 @@ class Api::V1::Issues::StatuesController < Api::V1::BaseController
 
   # 状态列表
   def index 
-    @statues = IssueStatus.where.not(name: '反馈').order("position asc")
+    @statues = IssueStatus.order("position asc")
     @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
     @statues = kaminary_select_paginate(@statues)
   end