|
|
|
@@ -90,7 +90,7 @@ public class WxCashBackActivityController extends BaseController { |
|
|
|
TenantEntity tenantInfo = getTenantInfo(); |
|
|
|
WxCashBackActivity activity = wxCashBackActivityService.getActivityById(id, tenantInfo.getTenantId()); |
|
|
|
activity.setItemList(wxCashBackActivityService.getActivityItems(id, tenantInfo.getTenantId())); |
|
|
|
activity.setMerchantList(wxCashBackActivityService.getActivityMerchants(id, tenantInfo.getTenantId())); |
|
|
|
activity.setMerchantList(wxCashBackActivityService.getActivityMerchants(id, tenantInfo.getTenantId(),false)); |
|
|
|
return new ResultData(activity); |
|
|
|
} |
|
|
|
|
|
|
|
|