Merge branch 'release_toaliyun_real' into release_real_202010

mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java

@@ -148,6 +148,10 @@ public class WxCardPayController extends BaseController {
                 wxCardSpendVo.setPayStatusS(tmpList);
             }
         }
+        List<Integer> sources = new ArrayList<Integer>();
+        sources.add(EnumMerchantSubsidySource.CARD.getCode());
+        wxCardSpendVo.setSources(sources);
+        wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode());
         wxCardSpendService.exportData(wxCardSpendVo, request, response);
     }