From 2c86ea46ccc256edb9977db73287112882bfbe66 Mon Sep 17 00:00:00 2001 From: simba Date: Tue, 16 May 2023 10:37:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/glxp/api/dao/auth/UserPersonDao.java | 1 + src/main/java/com/glxp/api/entity/auth/UserCertEntity.java | 1 + src/main/java/com/glxp/api/entity/auth/UserPersonEntity.java | 1 + src/main/java/com/glxp/api/entity/auth/UserRegisterEntity.java | 1 - src/main/resources/mybatis/mapper/auth/UserPersonMapper.xml | 1 - 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/auth/UserPersonDao.java b/src/main/java/com/glxp/api/dao/auth/UserPersonDao.java index 1024e1f..5694b0c 100644 --- a/src/main/java/com/glxp/api/dao/auth/UserPersonDao.java +++ b/src/main/java/com/glxp/api/dao/auth/UserPersonDao.java @@ -11,5 +11,6 @@ import java.util.List; public interface UserPersonDao extends BaseMapperPlus { + } diff --git a/src/main/java/com/glxp/api/entity/auth/UserCertEntity.java b/src/main/java/com/glxp/api/entity/auth/UserCertEntity.java index 988a404..5d865d9 100644 --- a/src/main/java/com/glxp/api/entity/auth/UserCertEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/UserCertEntity.java @@ -7,6 +7,7 @@ import lombok.Data; @Data @TableName("user_cert") public class UserCertEntity { + private Long id; private Long registerId; private Long companyId; diff --git a/src/main/java/com/glxp/api/entity/auth/UserPersonEntity.java b/src/main/java/com/glxp/api/entity/auth/UserPersonEntity.java index d37ca19..dab8627 100644 --- a/src/main/java/com/glxp/api/entity/auth/UserPersonEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/UserPersonEntity.java @@ -4,6 +4,7 @@ package com.glxp.api.entity.auth; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + @Data @TableName("user_person") public class UserPersonEntity { diff --git a/src/main/java/com/glxp/api/entity/auth/UserRegisterEntity.java b/src/main/java/com/glxp/api/entity/auth/UserRegisterEntity.java index 29c3bcd..e19a2f0 100644 --- a/src/main/java/com/glxp/api/entity/auth/UserRegisterEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/UserRegisterEntity.java @@ -6,7 +6,6 @@ import lombok.Data; @Data public class UserRegisterEntity { - private String id; private String companyId; private String mobile; diff --git a/src/main/resources/mybatis/mapper/auth/UserPersonMapper.xml b/src/main/resources/mybatis/mapper/auth/UserPersonMapper.xml index ebbc947..08952cb 100644 --- a/src/main/resources/mybatis/mapper/auth/UserPersonMapper.xml +++ b/src/main/resources/mybatis/mapper/auth/UserPersonMapper.xml @@ -19,7 +19,6 @@ -