From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
index 28b6fc6..4180450 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -59,14 +59,14 @@
return ApiResponse.success(memberService.wxPhone(wxPhoneRequest));
}
-// @ApiOperation(value = "娴嬭瘯鐧婚檰鎺ュ彛", notes = "灏忕▼搴忕")
-// @GetMapping("/testLogin")
-// @ApiImplicitParams({
-// @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "memberId", value = "鐢ㄦ埛缂栫爜", required = false)
-// })
-// public ApiResponse testLogin(@RequestParam Integer memberId) {
-// return ApiResponse.success(memberService.wxLoginTest(memberId));
-// }
+ @ApiOperation(value = "娴嬭瘯鐧婚檰鎺ュ彛", notes = "灏忕▼搴忕")
+ @GetMapping("/testLogin")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "memberId", value = "鐢ㄦ埛缂栫爜", required = false)
+ })
+ public ApiResponse testLogin(@RequestParam Integer memberId) {
+ return ApiResponse.success(memberService.wxLoginTest(memberId));
+ }
@ApiOperation(value = "鑾峰彇绯荤粺閰嶇疆", notes = "灏忕▼搴忕")
@GetMapping("/getPlatformAboutUs")
@@ -166,6 +166,5 @@
memberService.bindShopInfo(getMemberId(),recId);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
}
--
Gitblit v1.9.3