lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
owen 2023-08-23 10:24:01 +08:00
parent 4dd2d80887
commit da8b2eab6d
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysql/member_level.sql
View File

@ -9,7 +9,7 @@ create table member_level
name varchar(30) default '' not null comment '等级名称', name varchar(30) default '' not null comment '等级名称',
experience int default 0 not null comment '升级经验', experience int default 0 not null comment '升级经验',
level int default 0 not null comment '等级', level int default 0 not null comment '等级',
discount tinyint default 100 not null comment '享受折扣', discount_percent tinyint default 100 not null comment '享受折扣',
icon varchar(255) default '' not null comment '等级图标', icon varchar(255) default '' not null comment '等级图标',
background_url varchar(255) default '' not null comment '等级背景图', background_url varchar(255) default '' not null comment '等级背景图',
status tinyint default 0 not null comment '状态', status tinyint default 0 not null comment '状态',
@ -28,7 +28,7 @@ create table member_level_record
user_id bigint default 0 not null comment '用户编号', user_id bigint default 0 not null comment '用户编号',
level_id bigint default 0 not null comment '等级编号', level_id bigint default 0 not null comment '等级编号',
level int default 0 not null comment '会员等级', level int default 0 not null comment '会员等级',
discount tinyint default 100 not null comment '享受折扣', discount_percent tinyint default 100 not null comment '享受折扣',
experience int default 0 not null comment '升级经验', experience int default 0 not null comment '升级经验',
user_experience int default 0 not null comment '会员此时的经验', user_experience int default 0 not null comment '会员此时的经验',
remark varchar(255) default '' not null comment '备注', remark varchar(255) default '' not null comment '备注',

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java
View File

@ -29,7 +29,7 @@ public interface MemberLevelRecordConvert {
if (from != null) { if (from != null) {
to.setLevelId(from.getId()); to.setLevelId(from.getId());
to.setLevel(from.getLevel()); to.setLevel(from.getLevel());
to.setDiscount(from.getDiscount()); to.setDiscountPercent(from.getDiscountPercent());
to.setExperience(from.getExperience()); to.setExperience(from.getExperience());
} }
return to; return to;