From f50e081f650eb067cce44fce3db64a237fde145b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 13:44:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java
index be20797..a8a650d 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java
@@ -62,7 +62,7 @@
@ApiOperation(value = "查询会员主卡", notes = "")
- @PostMapping(value = "/getUserVipCard")
+ @GetMapping(value = "/getUserVipCard")
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = WxMoneyCardUseVO.class)
})
@@ -94,6 +94,7 @@
BeanUtils.copyProperties(item, vo);
return vo;
}).collect(Collectors.toList());
+ System.out.println(rows.get(0).getId());
return AjaxResult.buildSuccessInstance(rows);
}
--
Gitblit v1.9.1