Merge branch 'develop' of 192.168.1.249:LJJ/encrypted-file-system

efs-user/src/main/java/com/zjty/efs/user/subject/entity/Unit.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.GenericGenerator;
 
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import java.util.Date;
@@ -16,6 +17,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@Entity
 public class Unit {
 
     @Id

efs-user/src/main/java/com/zjty/efs/user/subject/service/impl/UserServiceImpl.java

@@ -127,7 +127,6 @@ public class UserServiceImpl implements UserService {
                 unitDao.save(unit);
                 log.info("新增单位:{}", unit.getName());
             }
-
             return userDo;
         }else {
             log.warn("新增出错；已存在该用户");