shopUserId

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

@@ -69,7 +69,7 @@ public class CurPointsExchangeRecord implements Serializable {
     /**
      * 会员id
      */
-    private Long userId;
+    private Long shopUserId;
 
     /**
      * 会员名称

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

@@ -139,7 +139,7 @@ public class CurPointsBasicSettingServiceImpl extends ServiceImpl<CurPointsBasic
 
         for (OldPointsExchangeRecord oldPointsExchangeRecord : oldPointsExchangeRecordList) {
             CurPointsExchangeRecord curPointsExchangeRecord = BeanUtil.toBean(oldPointsExchangeRecord, CurPointsExchangeRecord.class);
-            curPointsExchangeRecord.setUserId(oldPointsExchangeRecord.getMemberId());
+            curPointsExchangeRecord.setShopUserId(oldPointsExchangeRecord.getMemberId());
             curPointsExchangeRecord.setNickName(oldPointsExchangeRecord.getMemberName());
             curPointsExchangeRecordList.add(curPointsExchangeRecord);
         }