Commit Graph
62 Commits
Author SHA1 Message Date
@jyuhsin 957a156ec4 Merge remote-tracking branch 'origin/main' 2025-05-06 19:40:51 +08:00
@jyuhsin 6f5f6b8076 commit 2025-05-06 19:40:35 +08:00
c-zhouhf1 7c402ab402 commit 2025-05-06 19:24:20 +08:00
c-zhouhf1 0f098907d0 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd
# Conflicts:
#	backend/src/main/resources/views/platform/activity/user/index.html
2025-05-06 19:22:24 +08:00
c-zhouhf1 4b0dfc8f0e commit 2025-05-06 19:21:24 +08:00
Paidax 4bac34dd67 commit 2025-05-06 19:17:19 +08:00
c-zhouhf1 a4e8706cf2 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd
# Conflicts:
#	backend/src/main/resources/views/platform/activity/user/index.html
2025-05-06 18:07:48 +08:00
c-zhouhf1 692f3dbc37 commit 2025-05-06 18:06:33 +08:00
Paidax a8bf50dd73 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd
# Conflicts:
#	backend/application.yaml
#	backend/src/main/resources/application.yaml
2025-05-06 17:59:13 +08:00
Paidax 4742d0c4aa 短信+报名人员 2025-05-06 17:58:39 +08:00
@jyuhsin 3a2e992774 commit 2025-05-06 17:54:09 +08:00
@jyuhsin cece60f5d9 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	backend/src/main/resources/application.yaml
2025-05-06 17:44:55 +08:00
@jyuhsin a4b25fda54 commit 2025-05-06 17:44:32 +08:00
那些花儿 4eef7a632a .. 2025-05-06 16:21:00 +08:00
c-zhouhf1 e6658bd007 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd
# Conflicts:
#	frontend/vite.config.js
2025-05-06 15:02:42 +08:00
c-zhouhf1 8838142654 commit 2025-05-06 15:02:30 +08:00
c-zhouhf1 2366161259 commit 2025-05-06 15:01:24 +08:00
那些花儿 7038cc8eb4 .. 2025-05-06 14:53:56 +08:00
@jyuhsin 98a8d150f6 Merge remote-tracking branch 'origin/main' 2025-04-30 17:10:45 +08:00
@jyuhsin 2c8c2eb36f commit 2025-04-30 17:10:30 +08:00
c-zhouhf1 2e808c6b42 commit 2025-04-30 17:02:08 +08:00
Paidax e68d0b359d 组队 2025-04-30 16:48:04 +08:00
c-zhouhf1 48f9d35959 commit 2025-04-30 15:45:21 +08:00
那些花儿 440cf4e98c Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd
# Conflicts:
#	frontend/src/pages/activity/team-form/index.vue
2025-04-30 14:50:29 +08:00
那些花儿 459cc348bb .. 2025-04-30 14:49:17 +08:00
c-zhouhf1 f84efcdc27 commit 2025-04-30 14:46:36 +08:00
c-zhouhf1 217e6fc628 commit 2025-04-30 14:00:38 +08:00
c-zhouhf1 5ad48c3713 commit 2025-04-30 13:41:57 +08:00
那些花儿 baa6f7284a .. 2025-04-30 13:34:37 +08:00
c-zhouhf1 ad9a7bc7b8 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd 2025-04-30 10:13:02 +08:00
c-zhouhf1 73b3fc749e commit 2025-04-30 10:12:48 +08:00
那些花儿 29d286319a .. 2025-04-30 10:12:46 +08:00
那些花儿 bb394ce8e3 .. 2025-04-30 08:44:27 +08:00
那些花儿 f737a06299 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd 2025-04-30 08:41:52 +08:00
那些花儿 f16fc79617 .. 2025-04-30 08:40:32 +08:00
c-zhouhf1 086643b834 commit 2025-04-29 17:58:58 +08:00
Paidax 095d8335ac Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd 2025-04-29 16:51:22 +08:00
Paidax 48c533bc09 commit 2025-04-29 16:51:08 +08:00
Paidax c08670699a commit 2025-04-29 16:50:22 +08:00
c-zhouhf1 6491425435 commit 2025-04-29 16:42:55 +08:00
c-zhouhf1 12f54fb7e9 commit 2025-04-29 15:53:56 +08:00
那些花儿 e3c2051c29 .. 2025-04-29 10:54:01 +08:00
c-zhouhf1 71fedeb739 commit 2025-04-29 10:50:57 +08:00
c-zhouhf1 abcf3549df commit 2025-04-28 18:08:54 +08:00
那些花儿 12c3afb4a6 .. 2025-04-28 15:32:41 +08:00
那些花儿 cb3bcb57bc .. 2025-04-25 18:15:00 +08:00
@jyuhsin ae90c7c33d Merge remote-tracking branch 'origin/main' 2025-04-25 17:49:16 +08:00
@jyuhsin cad6649c73 commit 2025-04-25 17:49:01 +08:00
c-zhouhf1 e37753ade7 commit 2025-04-25 17:46:06 +08:00
Paidax c2b817dbe5 commit 2025-04-25 16:42:43 +08:00