diff --git a/package.json b/package.json index ac9dda4..4cf0bbd 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "koa-is-json": "^1.0.0", "lodash": "^4.17.10", "marked": "^0.5.0", - "merge": "^1.2.0", + "merge": "^2.1.1", "moment": "^2.22.2", "mongoose": "5.2.8", "mongoose-paginate-v2": "^1.0.12", diff --git a/yarn.lock b/yarn.lock index f76c434..4634bf3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5990,9 +5990,9 @@ merge2@^1.2.3: version "1.2.3" resolved "http://registry.npm.taobao.org/merge2/download/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5" -merge@^1.2.0: - version "1.2.1" - resolved "http://registry.npm.taobao.org/merge/download/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" +merge@^2.1.1: + version "2.1.1" + resolved "https://registry.npm.taobao.org/merge/download/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98" messageformat@^0.3.1: version "0.3.1"