diff --git a/_febs-jwt-vue/webpack3-vue-antd-febs-201907-admin/yarn.lock b/_febs-jwt-vue/webpack3-vue-antd-febs-201907-admin/yarn.lock index 455fdd8..dd301e0 100644 --- a/_febs-jwt-vue/webpack3-vue-antd-febs-201907-admin/yarn.lock +++ b/_febs-jwt-vue/webpack3-vue-antd-febs-201907-admin/yarn.lock @@ -5073,8 +5073,9 @@ merge-stream@^1.0.1: readable-stream "^2.0.1" merge@^1.2.0: - version "1.2.0" - resolved "http://registry.npm.taobao.org/merge/download/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" + integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== methods@~1.1.2: version "1.1.2"