Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

rk

65 分钟以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 server/platform/src/main/java/com/doumee/api/business/DiscountMemberController.java

@@ -85,7 +85,7 @@
    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:discountmember:query")
    public ApiResponse findById(@PathVariable String id) {
    public ApiResponse<DiscountMember> findById(@PathVariable String id) {
        return ApiResponse.success(discountMemberService.getDetail(id));
    }