From 4ca3ceaa2b0f09f2221ee6714918baf5faee4bad Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Thu, 15 Jul 2021 23:06:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java index 5ca3e8c..c2ebdf0 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java @@ -1,17 +1,31 @@ package com.matrix.system.fenxiao.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @Data -@ApiModel(value = "ShopSalesmanAppliingVo", description = "查询正在申请分销员的返参") +@ApiModel(value = "ShopSalesmanAppliingVo", description = "获取分销员待审核记录的返参") public class ShopSalesmanAppliingVo { @ApiModelProperty(value = "申请用户id") private String userId; + @ApiModelProperty(value = "分销员") private String nickname; + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty(value = "头像") + private String avatarUrl; + + @ApiModelProperty(value = "手机号码") + private String phone; + } -- Gitblit v1.9.1