merge conflict origin/master

This commit is contained in:
paulGao 2022-03-09 18:39:48 +08:00
commit df9dd7f435

View File

@ -33,7 +33,7 @@ public class MemberSignBuyerController {
@PreventDuplicateSubmissions @PreventDuplicateSubmissions
@PostMapping @PostMapping
@ApiOperation(value = "会员签到") @ApiOperation(value = "会员签到")
@LimitPoint(limit = 1) @LimitPoint(limit = 2)
public ResultMessage<Boolean> memberSign() { public ResultMessage<Boolean> memberSign() {
return ResultUtil.data(memberSignService.memberSign()); return ResultUtil.data(memberSignService.memberSign());
} }