王兆博 / tree · 提交

转到一个项目

作者 mdx
提交 b53c70fa7fee303d5f0dbceb9f385326d137f3b9 1 个父辈 6debc7cf

修改CUser，Bo，Vo

内嵌 并排对比
正在显示 4 个修改的文件 包含 14 行增加 和 0 行删除
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField; @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
7 import com.baomidou.mybatisplus.annotation.TableId; 7 import com.baomidou.mybatisplus.annotation.TableId;
8 import com.baomidou.mybatisplus.annotation.TableName; 8 import com.baomidou.mybatisplus.annotation.TableName;
9 import com.example.client.enumeration.Identity; 9 import com.example.client.enumeration.Identity;
  10 +import com.fasterxml.jackson.databind.annotation.JsonSerialize;
  11 +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
10 import lombok.Data; 12 import lombok.Data;
11 import lombok.NoArgsConstructor; 13 import lombok.NoArgsConstructor;
12 import lombok.experimental.Accessors; 14 import lombok.experimental.Accessors;
@@ -34,6 +36,7 @@ public class CUser implements Serializable { @@ -34,6 +36,7 @@ public class CUser implements Serializable {
34 * 用户id 36 * 用户id
35 */ 37 */
36 @TableId(value = "user_id") 38 @TableId(value = "user_id")
  39 + @JsonSerialize(using = ToStringSerializer.class)
37 private Long userId; 40 private Long userId;
38 41
39 /** 42 /**
@@ -3,6 +3,8 @@ package com.example.client.domain.bo; @@ -3,6 +3,8 @@ package com.example.client.domain.bo;
3 import cn.bronet.admin.common.core.domain.BaseEntity; 3 import cn.bronet.admin.common.core.domain.BaseEntity;
4 import cn.bronet.admin.common.core.validate.AddGroup; 4 import cn.bronet.admin.common.core.validate.AddGroup;
5 import cn.bronet.admin.common.core.validate.EditGroup; 5 import cn.bronet.admin.common.core.validate.EditGroup;
  6 +import com.fasterxml.jackson.databind.annotation.JsonSerialize;
  7 +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
6 import io.swagger.annotations.ApiModel; 8 import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty; 9 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 10 import lombok.Data;
@@ -36,6 +38,7 @@ public class CActivityBo extends BaseEntity { @@ -36,6 +38,7 @@ public class CActivityBo extends BaseEntity {
36 * 发布动态人的id 38 * 发布动态人的id
37 */ 39 */
38 @ApiModelProperty("发布动态人的id") 40 @ApiModelProperty("发布动态人的id")
  41 + @JsonSerialize(using = ToStringSerializer.class)
39 private Long userId; 42 private Long userId;
40 43
41 /** 44 /**
@@ -4,6 +4,8 @@ import cn.bronet.admin.common.core.domain.BaseEntity; @@ -4,6 +4,8 @@ import cn.bronet.admin.common.core.domain.BaseEntity;
4 import cn.bronet.admin.common.core.validate.AddGroup; 4 import cn.bronet.admin.common.core.validate.AddGroup;
5 import cn.bronet.admin.common.core.validate.EditGroup; 5 import cn.bronet.admin.common.core.validate.EditGroup;
6 import com.example.client.enumeration.Identity; 6 import com.example.client.enumeration.Identity;
  7 +import com.fasterxml.jackson.databind.annotation.JsonSerialize;
  8 +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
7 import io.swagger.annotations.ApiModel; 9 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 10 import io.swagger.annotations.ApiModelProperty;
9 import lombok.Data; 11 import lombok.Data;
@@ -29,6 +31,7 @@ public class CUserBo extends BaseEntity { @@ -29,6 +31,7 @@ public class CUserBo extends BaseEntity {
29 * 用户id 31 * 用户id
30 */ 32 */
31 @ApiModelProperty("用户id") 33 @ApiModelProperty("用户id")
  34 + @JsonSerialize(using = ToStringSerializer.class)
32 private Long userId; 35 private Long userId;
33 36
34 /** 37 /**
@@ -80,6 +83,7 @@ public class CUserBo extends BaseEntity { @@ -80,6 +83,7 @@ public class CUserBo extends BaseEntity {
80 * 当前孩子关系 83 * 当前孩子关系
81 */ 84 */
82 @ApiModelProperty("当前孩子关系") 85 @ApiModelProperty("当前孩子关系")
  86 + @JsonSerialize(using = ToStringSerializer.class)
83 private Long atPresent; 87 private Long atPresent;
84 88
85 /** 89 /**
@@ -118,7 +122,10 @@ public class CUserBo extends BaseEntity { @@ -118,7 +122,10 @@ public class CUserBo extends BaseEntity {
118 */ 122 */
119 @ApiModelProperty(value = "排序的方向", example = "asc,desc") 123 @ApiModelProperty(value = "排序的方向", example = "asc,desc")
120 private String isAsc; 124 private String isAsc;
  125 +
  126 +
121 @ApiModelProperty(value = "绑定学校", example = "asc,desc") 127 @ApiModelProperty(value = "绑定学校", example = "asc,desc")
  128 + @JsonSerialize(using = ToStringSerializer.class)
122 private Long schoolCurrent; 129 private Long schoolCurrent;
123 130
124 } 131 }
@@ -82,6 +82,7 @@ public class CUserVo { @@ -82,6 +82,7 @@ public class CUserVo {
82 */ 82 */
83 @Excel(name = "当前孩子关系") 83 @Excel(name = "当前孩子关系")
84 @ApiModelProperty("当前孩子关系") 84 @ApiModelProperty("当前孩子关系")
  85 + @JsonSerialize(using = ToStringSerializer.class)
85 private Long atPresent; 86 private Long atPresent;
86 87
87 /** 88 /**