Browse Source

国际时间

lyhzzz 1 year ago
parent
commit
a045c63520

+ 2 - 2
src/main/java/com/fdkankan/tk/entity/Room.java

@@ -108,12 +108,12 @@ public class Room implements Serializable {
 
     //使用开始时间    v1.1.0添加字段
     @TableField("use_start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date useStartTime;
 
     //使用结束时间    v1.1.0添加字段
     @TableField("use_end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date useEndTime;
 
     //房间密码  v1.1.0添加字段

+ 1 - 0
src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -138,6 +138,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                 wrapper.eq(Room::getRoomStatus,param.getRoomStatus());
             }
         }
+        wrapper.eq(Room::getPlatform,"4dkankan");
         wrapper.orderByDesc(Room::getUpdateTime);
 
         Page<Room> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);