合并冲突

sql/mysql/member_level.sql

@@ -9,7 +9,7 @@ create table member_level
     name             varchar(30)  default ''                not null comment '等级名称',
     experience       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 '等级图标',
     background_url   varchar(255) default ''                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 '用户编号',
     level_id         bigint       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 '升级经验',
     user_experience  int          default 0                 not null comment '会员此时的经验',
     remark           varchar(255) default ''                not null comment '备注',

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

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