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

cooleshow-app/src/test/resources/application.yml

@@ -1,4 +1,10 @@
 
+# SPRING配置
+spring:
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+
 #应用配置
 app-config:
   url:

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/AppVersionInfo.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 对应数据库表(app_version_info):
@@ -32,9 +33,11 @@ public class AppVersionInfo {
 	private Integer operatorId;
 	
 	/**  */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateTime;
 	
 	/**  */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private java.util.Date createTime;
 
 	public boolean isForceUpdate() {