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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberExport.java

@@ -48,6 +48,8 @@ public class BaseUserMemberExport  implements Serializable {
     private Integer beforeDiscount;
     @Column(name = "source")
     private Integer source;
+    @Column(name = "user_id")
+    private Integer userId;
 
 }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -324,6 +324,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
                         .beforeDiscount(beforeMember.getDiscount())
                         .discount(aftereMember.getDiscount())
                         .status(1)
+                        .userId(beforeMember.getUserId())
                         .crtTime(System.currentTimeMillis())
                         .crtId(Integer.valueOf(infoFromToken.getId()))
                         .crtName(infoFromToken.getUniqueName())