diff --git a/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/AdminUserVO.java b/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/AdminUserVO.java index 66aa7f8..805a668 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/AdminUserVO.java +++ b/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/AdminUserVO.java @@ -35,13 +35,13 @@ public class AdminUserVO { /** * 用户创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; /** * 用户修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date updateTime; public AdminUserVO(AdminUser adminUser) { diff --git a/admin/src/main/java/com/jinrui/reference/admin/model/vo/login/LoginVO.java b/admin/src/main/java/com/jinrui/reference/admin/model/vo/login/LoginVO.java index 0faecf3..2d30497 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/model/vo/login/LoginVO.java +++ b/admin/src/main/java/com/jinrui/reference/admin/model/vo/login/LoginVO.java @@ -35,13 +35,13 @@ public class LoginVO { /** * 用户创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; /** * 用户修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date updateTime; public LoginVO(AdminUser adminUser) { diff --git a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java index 5893c4d..e9a7d32 100644 --- a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java +++ b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java @@ -91,14 +91,14 @@ public interface NewsMapper { "news.publish_time as publishTime," + "news.update_time as updateTime " + "from news " + - "" + + "" + "inner join news_column_rel on news.id = news_column_rel.news_id " + "" + "" + "" + "news.title like concat('%', #{keyword}, '%') " + "" + - "" + + "" + "and news_column_rel.column_id in (${column}) " + "" + "" + @@ -108,7 +108,7 @@ public interface NewsMapper { "and news.id > #{last}" + "" + "" + - "order by concat('`', ${orderBy}, '`') " + + "order by news.${orderBy} " + "" + "desc" + "" + @@ -125,14 +125,14 @@ public interface NewsMapper { @Select("