Commit 2adfca69 authored by hezhen's avatar hezhen

Merge branch 'master_activity' into base-modify

parents 04e2a83d da62aa42
...@@ -53,11 +53,11 @@ public class User { ...@@ -53,11 +53,11 @@ public class User {
@ApiModelProperty("性别") @ApiModelProperty("性别")
private String sex; private String sex;
@Column(name = "group") @Column(name = "'group'")
@ApiModelProperty("分组") @ApiModelProperty("分组")
private Integer group; private Integer group;
@Column(name = "status") @Column(name = "'status'")
@ApiModelProperty("状态") @ApiModelProperty("状态")
private Integer status; private Integer status;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment