From 47ae9468857e0a13d91fc5e8c126246b80cfda62 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 11 十一月 2021 15:41:48 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java | 1 +
xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java | 5 ++++-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java | 3 +++
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java b/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
index eeddfdf..2a4bc4d 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
@@ -80,9 +80,12 @@
@ApiModelProperty(value = "鐢ㄦ埛澶村儚")
private String avatar = CommonConstant.USER_DEFAULT_AVATAR;
- @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鏅�氱敤鎴� 1绠＄悊鍛�")
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鏅�氱敤鎴� 1绠＄悊鍛� ")
private Integer type = CommonConstant.USER_TYPE_NORMAL;
+ @ApiModelProperty(value = "0:鍙告満 1锛氶厤閫佸憳")
+ private Integer type2;
+
@ApiModelProperty(value = "鐘舵�� 榛樿0姝ｅ父 -1鎷夐粦")
private Integer status = CommonConstant.USER_STATUS_NORMAL;
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
index a84a445..345ca04 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
@@ -141,6 +141,7 @@
User user = userService.get(fingerprint.getUserId());
fingerprint.setUsername(user.getUsername());
fingerprint.setPassword(user.getDescription());
+ fingerprint.setType(user.getType2());
}
if (iFingerprintService.saveOrUpdate(fingerprint)) {
return new ResultUtil<Fingerprint>().setData(fingerprint);
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java
index 4ba488b..8a84af8 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java
@@ -50,4 +50,7 @@
@ApiModelProperty(value = "瀵嗙爜")
private String password;
+ @ApiModelProperty(value = "0锛氬徃鏈� 1锛氶厤閫佸憳")
+ private Integer type;
+
}
\ No newline at end of file
--
Gitblit v1.9.1