From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Mon, 05 Apr 2021 22:48:14 +0800 Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算 --- zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopCustomDetailVo.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopCustomDetailVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopCustomDetailVo.java index 6f9507d..2b5a752 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopCustomDetailVo.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopCustomDetailVo.java @@ -1,13 +1,11 @@ package com.matrix.system.fenxiao.vo; -import java.math.BigDecimal; -import java.util.Date; - 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 = "ShopCustomDetailVo", description = "分销员客户基本信息的返参") @@ -18,10 +16,12 @@ private String avatarUrl; @ApiModelProperty(value = "分销员") private String nickname; - @ApiModelProperty(value = "加入时间") + @ApiModelProperty(value = "绑定时间") @JsonFormat(pattern="yyyy-MM-dd HH:mm",timezone="GMT+8") private Date createTime; - @ApiModelProperty(value = "申请方式1、自主申请,2、自动添加,3上级邀请,4、手动添加(来源)") - private Integer applyWay; + @ApiModelProperty(value = "绑定方式1、自主申请,2、自动添加,3上级邀请,4、手动添加(来源)") + private Integer applyWay; + @ApiModelProperty(value = "待成交次数") + private Integer doneNum; } -- Gitblit v1.9.1