From 6c746ec2d71de4f14af773c867c71fe55b32f49f Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期四, 16 三月 2023 21:31:45 +0800
Subject: [PATCH] 第一次提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java | 19 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZInfoUserController.java | 21 ++
ruoyi-framework/pom.xml | 9 +
ruoyi-admin/pom.xml | 14
ruoyi-system/pom.xml | 9 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 3
ruoyi-generator/pom.xml | 9 +
zhang-content/pom.xml | 10 +
pom.xml | 7
ruoyi-admin/src/main/resources/application.yml | 10
ruoyi-common/pom.xml | 9 +
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 120 ++++++++++++++
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 15 +
/dev/null | 24 ---
ruoyi-quartz/pom.xml | 9 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 22 ++
zhang-content/src/main/java/com/ruoyi/domain/PageParams.java | 33 ++++
ruoyi-admin/src/main/resources/application-druid.yml | 2
zhang-content/src/main/java/com/ruoyi/mapper/ZInfoUserMapper.java | 19 ++
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java | 27 +++
ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java | 30 ++-
23 files changed, 373 insertions(+), 52 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2f7acc6..b55f715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,6 +170,8 @@
<version>${ruoyi.version}</version>
</dependency>
+
+
</dependencies>
</dependencyManagement>
@@ -192,6 +194,11 @@
<build>
<plugins>
<plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index e195acd..0d8479c 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -37,7 +37,7 @@
<version>1.6.2</version>
</dependency>
- <!-- Mysql椹卞姩鍖� -->
+ <!-- Mysql椹卞姩鍖� -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -91,15 +91,15 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.1.0</version>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.1.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
- </configuration>
- </plugin>
+ </configuration>
+ </plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index d2d6e8c..2ee9439 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -89,6 +89,8 @@
ajax.put("uuid", uuid);
ajax.put("img", Base64.encode(os.toByteArray()));
+ ajax.put("code",200);
+ ajax.put("value",code);
return ajax;
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 922c03d..f424327 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -10,6 +10,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
+import org.springframework.security.core.parameters.P;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig;
@@ -43,7 +44,7 @@
* @param delete 鏄惁鍒犻櫎
*/
@GetMapping("/download")
- public void fileDownload(@PathParam("fileName") String fileName,@PathParam("delete") Boolean delete, HttpServletResponse response, HttpServletRequest request)
+ public void fileDownload(@PathParam("fileName") String fileName, @PathParam("delete") Boolean delete, HttpServletResponse response, HttpServletRequest request)
{
try
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZInfoUserController.java
new file mode 100644
index 0000000..484550c
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZInfoUserController.java
@@ -0,0 +1,21 @@
+package com.ruoyi.web.controller.system;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author ojq
+ * @since 2023-03-14
+ */
+@RestController
+@RequestMapping("/self/user")
+public class ZInfoUserController {
+
+
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
index 1fada30..2710cf2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZfPropertyController.java
@@ -1,11 +1,14 @@
package com.ruoyi.web.controller.system;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.PageParams;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.service.IZfPropertyService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,10 +31,18 @@
private IZfPropertyService zfPropertyService;
@GetMapping("/all")
- public TableDataInfo listAll(){
- startPage();
- List<ZfProperty> list = zfPropertyService.list();
- return getDataTable(list);
+ public AjaxResult listAll(PageParams pageParams){
+
+ Page<ZfProperty> page = new Page<ZfProperty>(pageParams.getPageNum(),pageParams.getPageSize());
+ Page<ZfProperty> pageResult = zfPropertyService.page(page);
+ AjaxResult success = AjaxResult.success();
+ success.put("msg","鎿嶄綔鎴愬姛");
+ success.put("code",200);
+ success.put("data",pageResult.getRecords());
+ success.put("total",pageResult.getTotal());
+ success.put("pageNum",pageResult.getCurrent());
+ success.put("pageSize",pageResult.getSize());
+ return success;
}
// /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..9f898c7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/MybatisPlusConfig.java
@@ -0,0 +1,27 @@
+package com.ruoyi.web.core.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Version 1.0
+ * @Author Jin_quan Ou
+ * @Date 2023-03-15 14:58
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+ //瀹氫箟鍒嗛〉鐨勬嫤鎴櫒
+ @Bean
+ public MybatisPlusInterceptor getMybatisPlusInterceptor() {
+ MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
+ mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+ return mybatisPlusInterceptor;
+ }
+
+}
+
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 11541ce..d73638d 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@
master:
url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: ZhangApp123!
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 5242ff5..ee5f796 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
+ profile: C:/ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁$畻 char 瀛楃楠岃瘉
@@ -70,13 +70,13 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 192.168.138.100
+ host: localhost
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
database: 0
- # 瀵嗙爜
- password: 123456
+# # 瀵嗙爜
+# password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -97,7 +97,7 @@
# 浠ょ墝瀵嗛挜
secret: abcdefghijklmnopqrstuvwxyz
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 30
+ expireTime: 60
# MyBatis閰嶇疆
mybatis-plus:
diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt
deleted file mode 100644
index 0931cb8..0000000
--- a/ruoyi-admin/src/main/resources/banner.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Application Version: ${ruoyi.version}
-Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-// _ooOoo_ //
-// o8888888o //
-// 88" . "88 //
-// (| ^_^ |) //
-// O\ = /O //
-// ____/`---'\____ //
-// .' \\| |// `. //
-// / \\||| : |||// \ //
-// / _||||| -:- |||||- \ //
-// | | \\\ - /// | | //
-// | \_| ''\---/'' | | //
-// \ .-\__ `-` ___/-. / //
-// ___`. .' /--.--\ `. . ___ //
-// ."" '< `.___\_<|>_/___.' >'"". //
-// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
-// \ \ `-. \_ __\ /__ _/ .-` / / //
-// ========`-.____`-.___\_____/___.-`____.-'======== //
-// `=---=' //
-// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
-// 浣涚淇濅綉 姘镐笉瀹曟満 姘告棤BUG //
-////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java b/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
index 6ef15dc..1ffe0cf 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
@@ -41,14 +41,28 @@
.strategyConfig(builder -> {
// builder.addInclude("zf_clean") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
// .addInclude("zf_collection") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- builder.addInclude("zf_contact") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("zf_doctor") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("zf_economy") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("zf_equipment") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("zf_event") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("zf_master") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("zf_pet") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("zf_pet_note"); // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ builder.addInclude("z_abroad") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_autobiography") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_certificate") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_child") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_dict") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_experience") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_health_base") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_health_habit") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_health_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_honor") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_idea") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_info_user") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_login_user") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_marry") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_property") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_secret") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_self_note") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_stay_out") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_travel_base") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_travel_price") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_year_health") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("z_year_info"); // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
builder.serviceBuilder()
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 33f8633..6866771 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -139,4 +139,13 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index 8c1d99a..94a99cf 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -67,7 +67,7 @@
/**
* 楠岃瘉鐮佹湁鏁堟湡锛堝垎閽燂級
*/
- public static final Integer CAPTCHA_EXPIRATION = 2;
+ public static final Integer CAPTCHA_EXPIRATION = 10;
/**
* 浠ょ墝
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index dc37c22..fae4bce 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -67,4 +67,13 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 10bda90..bf5f57b 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -37,4 +37,13 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 1922bcf..470832c 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -37,4 +37,13 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index aa268bd..ef656a0 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -25,4 +25,13 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/zhang-content/pom.xml b/zhang-content/pom.xml
index 123687e..ef877c5 100644
--- a/zhang-content/pom.xml
+++ b/zhang-content/pom.xml
@@ -45,5 +45,15 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+
</project>
\ No newline at end of file
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/PageParams.java b/zhang-content/src/main/java/com/ruoyi/domain/PageParams.java
new file mode 100644
index 0000000..bde2fa2
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/PageParams.java
@@ -0,0 +1,33 @@
+package com.ruoyi.domain;
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @Version 1.0
+ * @Author Jin_quan Ou
+ * @Date 2023-03-15 14:55
+ */
+@Data
+@ToString
+public class PageParams {
+ //褰撳墠椤电爜榛樿鍊�
+ public static final long DEFAULT_PAGE_CURRENT = 1L;
+ //姣忛〉璁板綍鏁伴粯璁ゅ��
+ public static final long DEFAULT_PAGE_SIZE = 10L;
+
+ //褰撳墠椤电爜
+ private Long pageNum = DEFAULT_PAGE_CURRENT;
+
+ //姣忛〉璁板綍鏁伴粯璁ゅ��
+ private Long pageSize = DEFAULT_PAGE_SIZE;
+
+ public PageParams(){
+
+ }
+
+ public PageParams(long pageNum,long pageSize){
+ this.pageNum = pageNum;
+ this.pageSize = pageSize;
+ }
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 07cc839..1f5d063 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -1,9 +1,127 @@
package com.ruoyi.domain;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
/**
* @Version 1.0
* @Author Jin_quan Ou
* @Date 2023-03-12 17:09
*/
-public class ZInfoUser {
+@TableName("z_info_user")
+@Data
+@ToString
+public class ZInfoUser implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "user_id", type = IdType.AUTO)
+ private Integer userId;
+
+ /**
+ * 濮撳悕
+ */
+ private String nickName;
+
+ /**
+ * 鏇剧敤鍚�
+ */
+ private String oldName;
+
+ /**
+ * 鎬у埆
+ */
+ private Integer sex;
+
+ /**
+ * 鍥界睄
+ */
+ private String nationality;
+
+ /**
+ * 姘戞棌
+ */
+ private String nation;
+
+ /**
+ * 濠氬Щ鐘跺喌--0锛氭湭濠氾紝1锛氬凡濠氾紝2锛氱濠�
+ */
+ private Integer maritalStatus;
+
+ /**
+ * 鏀挎不闈㈣矊
+ */
+ private String politicalOutlook;
+
+ /**
+ * 鐢佃瘽鍙风爜
+ */
+ private String phoneNumber;
+
+ /**
+ * 韬唤璇佸彿
+ */
+ private String idNum;
+
+ /**
+ * 鎴风睄鍦板潃
+ */
+ private String locationAddress;
+
+ /**
+ * 甯镐綇鍦板潃
+ */
+ private String alwaysAddress;
+
+ /**
+ * 鎴风睄鍦板叕瀹夋満鍏�
+ */
+ private String locationPolice;
+
+ /**
+ * 甯镐綇鍦板叕瀹夋満鍏�
+ */
+ private String alwaysPolice;
+
+ /**
+ * 鎵�鍦ㄥ崟浣�/瀛︽牎
+ */
+ private String unit;
+
+ /**
+ * 鑱屽姟/韬唤
+ */
+ private String position;
+
+ /**
+ * 鍥剧墖鍦板潃
+ */
+ private String img;
+
+ /**
+ * 鐖朵翰鐨刬d
+ */
+ private Integer fatherId;
+
+ /**
+ * 姣嶄翰鐨刬d
+ */
+ private Integer momId;
+
+ /**
+ * 鍑虹敓骞存湀鏃�
+ */
+ private LocalDate birth;
+
+ /**
+ * 涓汉鑳屾櫙鍥剧墖銆佽棰�
+ */
+ private String url;
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZInfoUserMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZInfoUserMapper.java
new file mode 100644
index 0000000..4351669
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZInfoUserMapper.java
@@ -0,0 +1,19 @@
+package com.ruoyi.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.ZInfoUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author ojq
+ * @since 2023-03-14
+ */
+@Mapper
+public interface ZInfoUserMapper extends BaseMapper<ZInfoUser> {
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
new file mode 100644
index 0000000..77689d8
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -0,0 +1,15 @@
+package com.ruoyi.service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.ZInfoUser;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author ojq
+ * @since 2023-03-14
+ */
+public interface ZInfoUserService extends IService<ZInfoUser> {
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
new file mode 100644
index 0000000..97d663b
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -0,0 +1,22 @@
+package com.ruoyi.service.impl;
+
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.mapper.ZInfoUserMapper;
+import com.ruoyi.service.ZInfoUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author ojq
+ * @since 2023-03-14
+ */
+@Service
+public class ZInfoUserServiceImpl extends ServiceImpl<ZInfoUserMapper, ZInfoUser> implements ZInfoUserService {
+
+}
--
Gitblit v1.9.1