suntianwu 3 éve
szülő
commit
117b354a1e

+ 1 - 1
src/main/java/com/care/bms/controller/DeviceController.java

@@ -56,7 +56,7 @@ public class DeviceController {
                                                  @RequestParam(value = "status", required = false) String status,
                                                  @RequestParam(value = "houseAddr", required = false) String houseAddr,
                                                  @RequestParam(value = "chambId", required = false) Long chambId,
-                                                 @RequestParam(value = "chambId", required = false) Long memberId,
+                                                 @RequestParam(value = "memberId", required = false) Long memberId,
                                                  PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);

+ 3 - 0
src/main/java/com/care/client/vo/HouseContactVO.java

@@ -2,6 +2,7 @@ package com.care.client.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -67,10 +68,12 @@ public class HouseContactVO implements Serializable {
 
 
     @ApiModelProperty("createTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
 
     @ApiModelProperty("modifyTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date modifyTime;
 
 

+ 2 - 0
src/main/java/com/care/client/vo/OlderVO.java

@@ -1,6 +1,7 @@
 package com.care.client.vo;
 
 import cn.hutool.core.date.DateUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -43,6 +44,7 @@ public class OlderVO {
 
 
     @ApiModelProperty("生日")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date birthday;
 
 

+ 4 - 0
src/main/java/com/care/common/vo/memberinfo/MemberInfoVO.java

@@ -1,6 +1,7 @@
 package com.care.common.vo.memberinfo;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -61,14 +62,17 @@ public class MemberInfoVO implements Serializable {
     private String status;
 
     @ApiModelProperty("createTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
 
     @ApiModelProperty("modifyTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date modifyTime;
 
 
     @ApiModelProperty("生日")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date birthday;
 
     @ApiModelProperty("地址")