From b0c5d432ec041221dcbe81ca5ae3aa20fe3bddc6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 22 Mar 2021 20:17:58 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java
index 2f5e221..9dc6cea 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopScoreAction.java
@@ -39,11 +39,11 @@
     ScoreVipDetailDao scoreVipDetailDao;
 
     @ApiOperation(value = "获取积分流水", notes = "")
-    @PostMapping(value = "/getOrderList")
+    @PostMapping(value = "/getFlowList")
     @ApiResponses({
             @ApiResponse(code = 200, message = "ok", response = ScoreUseRecordVo.class)
     })
-    AjaxResult getInvitationuserList(@RequestBody @Validated ScoreFlowDto scoreFlowDto) {
+    AjaxResult getFlowList(@RequestBody @Validated ScoreFlowDto scoreFlowDto) {
         BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
         Page<ScoreUseRecordVo> page=new Page<>(scoreFlowDto.getPageNum(),scoreFlowDto.getPageSize());
         scoreFlowDto.setUserId(loginUser.getOpenId());

--
Gitblit v1.9.1