Merge branch 'fix_trips'

netflix-dao/src/main/java/com/cyksj/model/entity/HomeGroup.java

@@ -25,6 +25,7 @@ public class HomeGroup extends BaseEntity{
     private Long relationId;
 
     @DbField("gr.user_id")
+    @TableField(exist = false)
     private Long userId;
 
     /**