合并冲突

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

View File

@ -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;