wyc

src/main/java/com/zhentao/user/domain/UserLogin.java

@@ -125,36 +125,20 @@ public class UserLogin implements Serializable {
     private Date updatedTime;
 
     /**
-<<<<<<< HEAD
-     *
-=======
-     *
->>>>>>> c8f9768 (1)
+
      */
     private String openId;
 
     /**
-<<<<<<< HEAD
-     *
-=======
-     *
->>>>>>> c8f9768 (1)
+
      */
     private String sessionKey;
 
     /**
-<<<<<<< HEAD
-     *
-=======
-     *
->>>>>>> c8f9768 (1)
+
      */
     private String uniId;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-<<<<<<< HEAD
-}
-=======
 }
->>>>>>> c8f9768 (1)