浏览代码

。。。

wangwei 6 年之前
父节点
当前提交
20be6ecdf3

+ 11 - 8
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserEntity.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.dao.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -7,7 +8,6 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
 
 import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 import cn.com.qmth.examcloud.core.basic.dao.enums.Gender;
@@ -16,8 +16,8 @@ import cn.com.qmth.examcloud.core.basic.dao.enums.Gender;
  * Created by songyue on 17/1/13.
  */
 @Entity
-@Table(name = "ecs_core_user", indexes = {
-		@Index(name = "IDX_B_USER_001001", columnList = "rootOrgId,loginName", unique = true)})
+@Table(name = "EC_B_USER", indexes = {
+		@Index(name = "IDX_B_U_002001", columnList = "rootOrgId,loginName", unique = true)})
 public class UserEntity extends JpaEntity {
 
 	private static final long serialVersionUID = 9190180279768027647L;
@@ -26,18 +26,18 @@ public class UserEntity extends JpaEntity {
 	@GeneratedValue
 	private Long id;
 
-	@NotNull
+	@Column(nullable = false)
 	private Long rootOrgId;
 
 	private Long orgId;
 
-	@NotNull
+	@Column(nullable = false)
 	private String name;
 
-	@NotNull
+	@Column(nullable = false)
 	private String loginName;
 
-	@NotNull
+	@Column(nullable = false)
 	private String password;
 
 	private String mobile;
@@ -45,9 +45,12 @@ public class UserEntity extends JpaEntity {
 	@Enumerated(EnumType.STRING)
 	private Gender gender;
 
+	/**
+	 * 头像
+	 */
 	private String avatar;
 
-	@NotNull
+	@Column(nullable = false)
 	private Boolean enable;
 
 	public Long getId() {