Merge branch 'main' of https://github.com/wkylin/pro-react-admin into…

… main
wkylin · Mar 15, 2024 · 43387d7 · 43387d7
2 parents f3b7149 + 20acfca
commit 43387d7
Show file tree

Hide file tree

Showing 4 changed files with 2,301 additions and 17 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:21.2-alpine3.18
+FROM node:21.6-alpine3.18
 WORKDIR /promotion-web
 COPY package.json /promotion-web
 RUN yarn install

diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -13,7 +13,7 @@
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
     "express": "^4.18.2",
-    "mongoose": "^7.6.2"
+    "mongoose": "^7.6.4"
   },
   "devDependencies": {
     "nodemon": "^2.0.22"

diff --git a/package-lock.json b/package-lock.json