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

5 years ago · 4f4654a45b
parent 2bfa36d086 ea317cd7c1
commit 4f4654a45b
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/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)