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

app/controllers/application_controller.rb

@@ -568,7 +568,7 @@ class ApplicationController < ActionController::Base
 	end
 
 	def strf_date(date)
-		date.blank? ? '' : date.strftime("%Y-%m-%d")
+		date.blank? ? '' : Time.parse(date).strftime("%Y-%m-%d")
 	end
 
 	def logger_error(error)