Merge branch 'master' into dev

abb24719 · hanfeng · b8a27e02 · eda33414 · abb24719
Commit abb24719 authored Dec 10, 2019 by hanfeng
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ActivityTemporary.java ...va/com/xxfc/platform/summit/entity/ActivityTemporary.java +1 -1

No files found.
--- a/xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityTemporary.java
+++ b/xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityTemporary.java
@@ -26,7 +26,7 @@ public class ActivityTemporary {
    private Integer id;
    private String name;
    private String phone;
-    private Integer inviter;
+    private String inviter;
    @Column(name = "crt_time")
    private Date crtTime;
    @Column(name = "upd_time")