BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 61d51e54dc46ae7abe770d06685004303380ff2e

Authored by YunaiV
2 parents f33b6655 e490195c

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 

 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
Inline Side-by-side
Showing 2 changed files with 7 additions and 1 deletions
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
  View file @61d51e5
@@ -43,6 +43,9 @@ public class MemberUserBaseVO { @@ -43,6 +43,9 @@ public class MemberUserBaseVO {
43 @Schema(description = "所在地", example = "4371") 43 @Schema(description = "所在地", example = "4371")
44 private Long areaId; 44 private Long areaId;
45 45
  46 + @Schema(description = "所在地可视化显示", example = "4371")
  47 + private String areaName;
  48 +
46 @Schema(description = "出生日期", example = "2023-03-12") 49 @Schema(description = "出生日期", example = "2023-03-12")
47 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) 50 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
48 private LocalDateTime birthday; 51 private LocalDateTime birthday;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
  View file @61d51e5
@@ -9,9 +9,11 @@ import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateR @@ -9,9 +9,11 @@ import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateR
9 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO; 9 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO;
10 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO; 10 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
11 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; 11 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
  12 +import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
12 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; 13 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
13 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 14 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
14 import org.mapstruct.Mapper; 15 import org.mapstruct.Mapper;
  16 +import org.mapstruct.Mapping;
15 import org.mapstruct.factory.Mappers; 17 import org.mapstruct.factory.Mappers;
16 18
17 import java.util.List; 19 import java.util.List;
@@ -20,7 +22,7 @@ import java.util.Map; @@ -20,7 +22,7 @@ import java.util.Map;
20 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; 22 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
21 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; 23 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
22 24
23 -@Mapper 25 +@Mapper(uses = {AddressConvert.class})
24 public interface MemberUserConvert { 26 public interface MemberUserConvert {
25 27
26 MemberUserConvert INSTANCE = Mappers.getMapper(MemberUserConvert.class); 28 MemberUserConvert INSTANCE = Mappers.getMapper(MemberUserConvert.class);
@@ -35,6 +37,7 @@ public interface MemberUserConvert { @@ -35,6 +37,7 @@ public interface MemberUserConvert {
35 37
36 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page); 38 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page);
37 39
  40 + @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName")
38 MemberUserRespVO convert03(MemberUserDO bean); 41 MemberUserRespVO convert03(MemberUserDO bean);
39 42
40 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult, 43 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult,