Merge remote-tracking branch 'origin/master'

doum

昨天 d0da0ce546110de49cca9e0358029a51c53188d6

 server/dmmall_web/src/main/java/com/doumee/api/web/mall/ShopCartApi.java

@@ -48,7 +48,7 @@
    }

    @LoginRequired
    @ApiOperation("购物车列表")
    @ApiOperation("购物车数量")
    @GetMapping("/cartGoodsTypeNum")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)