shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-04-30 01:43:12 +08:00
parent b495235eaf
commit 3df973e469
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
View File

@@ -109,6 +109,8 @@ public class CurrentUserInfoVo {
*/ */
@Schema(description = "民族") @Schema(description = "民族")
private String nation; private String nation;
@Schema(description = "婚况")
private Integer marriage;
/** /**
* 相册 * 相册
*/ */

1
ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
View File

@@ -112,6 +112,7 @@ public class CurrentUserManager {
vo.setBaseStep(user.getBaseStep()); vo.setBaseStep(user.getBaseStep());
vo.setImToken(user.getImToken()); vo.setImToken(user.getImToken());
vo.setWxCode(user.getWxCode()); vo.setWxCode(user.getWxCode());
vo.setMarriage(user.getMarriage());
UserAuth userAuth = userAuthService.getByUserId(userId); UserAuth userAuth = userAuthService.getByUserId(userId);
vo.setAlreadyAuthNum(userAuth.getAlreadyAuthNum()); vo.setAlreadyAuthNum(userAuth.getAlreadyAuthNum());
List<UserPictures> userPictures = userPicturesService.listByUserIdAuditingAndSuccess(user.getId()); List<UserPictures> userPictures = userPicturesService.listByUserIdAuditingAndSuccess(user.getId());