Merge branch 'dev2' of http://110.42.96.64:19890/GoCo/OL-LearnPlatform-Backend into dev2

merge
2025-09-26 10:29:01 +08:00 · 2025-09-26 10:29:01 +08:00 · 237a4f10a8
commit 237a4f10a8
parent 3f56528979 92d85b3e44
3 changed files with 2565 additions and 136 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -59,7 +59,8 @@ services:
    image: jeecg-boot-system
    hostname: jeecg-boot-system
    ports:
-      - 25525:8080
+<<<<<<< Updated upstream
+      - 25525:8080s
    networks:
      - jeecg-boot
  jeecg-vue:
--- a/jeecgboot-vue3/pnpm-lock.yaml
+++ b/jeecgboot-vue3/pnpm-lock.yaml
--- a/start-docker-compose.sh
+++ b/start-docker-compose.sh