From 72ecec0b10b2cc912ceeb6faa49790859028d638 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Wed, 21 May 2025 14:05:24 +0800 Subject: [PATCH] //activity v.2 --- .../java/com/iformall/domain/po/WxVtwoAmountGiftActivity.java | 2 +- .../java/com/iformall/domain/po/WxVtwoCashBackActivity.java | 2 +- .../java/com/iformall/domain/po/WxVtwoPrizeDrawActivity.java | 2 +- .../service/impl/WxVtwoAmountGiftActivityServiceImpl.java | 2 +- .../service/impl/WxVtwoCashBackActivityServiceImpl.java | 2 +- .../service/impl/WxVtwoPrizeDrawActivityServiceImpl.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoAmountGiftActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoAmountGiftActivity.java index eb1490619..68025bdc1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoAmountGiftActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoAmountGiftActivity.java @@ -101,7 +101,7 @@ public class WxVtwoAmountGiftActivity extends TenantEntity { private List merchantIdList; @TableField(exist = false) - private List merchanList; + private List merchantList; /** * 活动状态 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackActivity.java index 0e5f8c4af..6c6446c7a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackActivity.java @@ -100,7 +100,7 @@ public class WxVtwoCashBackActivity extends TenantEntity { private List merchantIdList; @TableField(exist = false) - private List merchanList; + private List merchantList; /** * 活动状态 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoPrizeDrawActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoPrizeDrawActivity.java index d966d8452..8f0bdc038 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoPrizeDrawActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoPrizeDrawActivity.java @@ -107,7 +107,7 @@ public class WxVtwoPrizeDrawActivity extends TenantEntity { private List merchantIdList; @TableField(exist = false) - private List merchanList; + private List merchantList; /** * 活动状态 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java index c89a02edc..57353c3d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java @@ -186,7 +186,7 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); - amountGiftActivity.setMerchanList(activityMerchantList); + amountGiftActivity.setMerchantList(activityMerchantList); } return amountGiftActivity; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java index 264a680d5..e06ec17d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java @@ -185,7 +185,7 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); - cashBackActivity.setMerchanList(activityMerchantList); + cashBackActivity.setMerchantList(activityMerchantList); } return cashBackActivity; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java index f07431d5a..ebe57f50e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java @@ -191,7 +191,7 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); - prizeDrawActivity.setMerchanList(activityMerchantList); + prizeDrawActivity.setMerchantList(activityMerchantList); } return prizeDrawActivity; }