修改BasePerson引用

ruoyi-zzb/src/main/java/com/ruoyi/zzb/module2/test.java

@@ -1,4 +0,0 @@
-package com.ruoyi.zzb.module2;
-
-public class test {
-}

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/domain/BasePersonInfo.java

@@ -1,39 +0,0 @@
-package com.ruoyi.zzb.study.domain;
-
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@TableName("ZZB_BASE_PERSON_INFO")
-public class BasePersonInfo {
-
-    private String userId;
-    private String name;
-    private String idcard;
-    private String phone;
-    private String policeNo;
-    private String parentDeptName;
-    private String parentDeptCode;
-    private String deptName;
-    private String deptCode;
-
-    @TableLogic
-    private String status;
-    private String password;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String createTime;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String updateTime;
-}

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/mapper/BasePersonInfoMapper.java

@@ -1,9 +0,0 @@
-package com.ruoyi.zzb.study.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.zzb.study.domain.BasePersonInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface BasePersonInfoMapper  extends BaseMapper<BasePersonInfo> {
-}

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/service/StudyService.java

@@ -8,21 +8,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.zzb.study.domain.BasePersonInfo;
+import com.ruoyi.zzb.base.domain.BasePersonInfo;
+import com.ruoyi.zzb.base.mapper.BasePersonInfoMapper;
 import com.ruoyi.zzb.study.domain.StudyDocInfo;
 import com.ruoyi.zzb.study.domain.StudyViewLogInfo;
 import com.ruoyi.zzb.study.domain.UserSearchParam;
 import com.ruoyi.zzb.study.domain.req.SaveViewLogVO;
 import com.ruoyi.zzb.study.domain.req.UpdatePageViewNumVO;
-import com.ruoyi.zzb.study.mapper.BasePersonInfoMapper;
 import com.ruoyi.zzb.study.mapper.StudyDocInfoMapper;
 import com.ruoyi.zzb.study.mapper.StudyViewLogInfoMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 @Slf4j
 @DataSource(value = DataSourceType.SLAVE)

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/controller/ZdcxController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.zzb.zdcx.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.zzb.base.domain.BasePersonInfo;
 import com.ruoyi.zzb.common.RspResult;
-import com.ruoyi.zzb.study.domain.BasePersonInfo;
 import com.ruoyi.zzb.zdcx.domain.Zdcx;
 import com.ruoyi.zzb.zdcx.service.ZdcxService;
 import lombok.extern.slf4j.Slf4j;

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/service/ZdcxService.java

@@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.zzb.study.domain.BasePersonInfo;
-import com.ruoyi.zzb.study.mapper.BasePersonInfoMapper;
+
+import com.ruoyi.zzb.base.domain.BasePersonInfo;
+import com.ruoyi.zzb.base.mapper.BasePersonInfoMapper;
 import com.ruoyi.zzb.zdcx.domain.Zdcx;
 import com.ruoyi.zzb.zdcx.mapper.ZdcxMapper;
 import lombok.extern.slf4j.Slf4j;