Merge remote-tracking branch 'origin/master'

doum

14 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

 server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java

@@ -17,6 +17,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import lombok.extern.java.Log;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -153,4 +154,18 @@
        return ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation(value = "商户绑定", notes = "小程序端")
    @GetMapping("/bindShopInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "recId", value = "商户主键", required = true)
    })
    public ApiResponse bindShopInfo(@RequestParam Integer recId) {
        memberService.bindShopInfo(getMemberId(),recId);
        return  ApiResponse.success("操作成功");
    }


}