Commit 7bf1ea7b authored by hanfeng's avatar hanfeng

Merge branch 'master-bug-vehiclemodel-hf' into dev

parents 3403c5cf f1ec8316
...@@ -330,7 +330,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem ...@@ -330,7 +330,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
.beforeDiscount(finalBeforeMember.getDiscount()) .beforeDiscount(finalBeforeMember.getDiscount())
.discount(aftereMember.getDiscount()) .discount(aftereMember.getDiscount())
.status(1) .status(1)
.userId(finalBeforeMember.getUserId()) .userId(aftereMember.getUserId())
.crtTime(System.currentTimeMillis()) .crtTime(System.currentTimeMillis())
.crtId(Integer.valueOf(infoFromToken.getId())) .crtId(Integer.valueOf(infoFromToken.getId()))
.crtName(infoFromToken.getUniqueName()) .crtName(infoFromToken.getUniqueName())
......
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