1

src/main/java/com/czg/mergedata/cur/entity/CurMemberPointsLog.java

@@ -42,7 +42,7 @@ public class CurMemberPointsLog implements Serializable {
     /**
      * 用户id
      */
-    private Long userId;
+    private Long shopUserId;
 
     /**
      * 摘要信息（如：兑换某个商品/消费多少钱/充值多少钱/新会员赠送积分等）

src/main/java/com/czg/mergedata/cur/service/impl/CurPointsBasicSettingServiceImpl.java

@@ -164,7 +164,7 @@ public class CurPointsBasicSettingServiceImpl extends ServiceImpl<CurPointsBasic
 
         for (OldMemberPointsLog oldMemberPointsLog : oldMemberPointsLogList) {
             CurMemberPointsLog memberPointsLog = BeanUtil.toBean(oldMemberPointsLog, CurMemberPointsLog.class);
-            memberPointsLog.setUserId(oldMemberPointsLog.getMemberId());
+            memberPointsLog.setShopUserId(oldMemberPointsLog.getMemberId());
             curMemberPointsLogs.add(memberPointsLog);
         }