Commit 311db541 authored by jiaorz's avatar jiaorz

修改用户会员信息接口

parent 574e1a02
package com.github.wxiaoqi.security.admin.dto; package com.github.wxiaoqi.security.admin.dto;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.io.Serializable;
/** /**
* 用户会员信息 * 用户会员信息
*/ */
...@@ -80,4 +81,6 @@ public class BaseUserMemberVO implements Serializable { ...@@ -80,4 +81,6 @@ public class BaseUserMemberVO implements Serializable {
private Integer discount; private Integer discount;
@Column(name = "member_type")
private Integer memberType;
} }
...@@ -71,4 +71,7 @@ public class UserMemberDTO { ...@@ -71,4 +71,7 @@ public class UserMemberDTO {
@Column(name = "member_name") @Column(name = "member_name")
@ApiModelProperty("会员名") @ApiModelProperty("会员名")
private String memberName; private String memberName;
@Column(name = "member_type")
private Integer memberType;
} }
...@@ -40,7 +40,8 @@ ...@@ -40,7 +40,8 @@
m.valid_time as validTime, m.valid_time as validTime,
m.member_name as memberName, m.member_name as memberName,
m.discount as discount, m.discount as discount,
ml.name as name ml.name as name,
m.member_type as memberType
from from
base_user_member m base_user_member m
left join left join
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment