Merge branch 'master_activity' into base-modify

2adfca69 · hezhen · 04e2a83d · da62aa42 · 2adfca69
Commit 2adfca69 authored Oct 09, 2019 by hezhen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

User.java ...i/src/main/java/com/xxfc/platform/summit/entity/User.java +2 -2

No files found.
--- a/xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/User.java
+++ b/xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/User.java
@@ -53,11 +53,11 @@ public class User {
    @ApiModelProperty("性别")
    private String sex;

-    @Column(name = "group")
+    @Column(name = "'group'")
    @ApiModelProperty("分组")
    private Integer group;

-    @Column(name = "status")
+    @Column(name = "'status'")
    @ApiModelProperty("状态")
    private Integer status;