From 2226679bda25ddf977f12367a9a37fcf4e377249 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 17 六月 2025 11:00:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java index 1336c10..87891a6 100644 --- a/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java +++ b/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java @@ -7,8 +7,9 @@ import cn.lili.modules.lmk.domain.form.StoreMemberForm; import cn.lili.modules.lmk.domain.query.StoreMemberQuery; import cn.lili.modules.lmk.service.StoreMemberService; +import cn.lili.modules.member.entity.dos.Member; +import cn.lili.modules.member.service.MemberService; import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; import lombok.RequiredArgsConstructor; import java.util.List; import javax.validation.constraints.NotEmpty; @@ -31,12 +32,20 @@ // store_member private final StoreMemberService storeMemberService; + private final MemberService memberService; + @PostMapping @ApiOperation(value = "娣诲姞", notes = "娣诲姞") public Result add(@RequestBody @Validated(Add.class) StoreMemberForm form) { return storeMemberService.add(form); } + @PutMapping("/restPassword/{id}") + @ApiOperation(value = "閲嶇疆瀵嗙爜", notes = "閲嶇疆瀵嗙爜") + public Result restPassword(@PathVariable String id){ + return memberService.resetPassword(id); + } + @PutMapping @ApiOperation(value = "淇敼", notes = "淇敼") public Result update(@RequestBody @Validated(Update.class) StoreMemberForm form) { -- Gitblit v1.8.0