Commit Graph

179 Commits

Author SHA1 Message Date
30404 c21ff4234c 12 2024-07-08 19:48:12 +08:00
30404 74dbded8d5 12 2024-07-08 19:47:40 +08:00
nopy 48d933f218 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-08 15:30:02 +08:00
nopy 162c946cf4 1 2024-07-08 15:29:59 +08:00
30404 709419e497 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-08 15:20:20 +08:00
30404 512897fad9 认为 2024-07-08 15:20:19 +08:00
nopy 1100eb7821 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-08 14:33:32 +08:00
nopy f6e5c027ce 1 2024-07-08 14:33:27 +08:00
30404 d339216780 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-08 14:25:32 +08:00
30404 037d6a5f28 2123 2024-07-08 14:24:27 +08:00
nopy fa78f1790b Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-08 14:24:00 +08:00
nopy 701e9fdbbf 1 2024-07-08 14:23:57 +08:00
30404 bf21e6035c Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-08 00:45:29 +08:00
30404 b48094d3d0 12 2024-07-08 00:45:27 +08:00
nopy 2ad4f89196 1 2024-07-08 00:45:08 +08:00
nopy 12179a372e 1 2024-07-08 00:44:55 +08:00
nopy 2b77b063dc 1 2024-07-08 00:42:32 +08:00
30404 95f3590150 123 2024-07-07 21:02:06 +08:00
30404 822a02f88f 123 2024-07-07 17:06:24 +08:00
30404 d4634017bf 123 2024-07-07 17:05:54 +08:00
nopy 8d29d0eb44 1 2024-07-07 16:22:38 +08:00
nopy da7c3f5372 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-07 15:58:36 +08:00
nopy 9f2d309b15 1 2024-07-07 15:58:33 +08:00
30404 f8502cba14 修改SendTrain 2024-07-07 15:36:41 +08:00
nopy cbc40b4491 1 2024-07-06 23:56:38 +08:00
nopy c5d3383813 1 2024-07-06 18:50:07 +08:00
nopy 4b8313e859 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-06 13:04:17 +08:00
nopy 685470eab4 1 2024-07-06 13:04:14 +08:00
30404 5074ea46b5 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-06 13:01:50 +08:00
30404 4e5014a921 123 2024-07-06 13:01:49 +08:00
nopy 7f690bb39c Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-06 01:00:44 +08:00
nopy 03269269c6 1 2024-07-06 01:00:41 +08:00
30404 c1a414e712 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-05 17:15:38 +08:00
30404 fbb9f09286 123456 2024-07-05 17:15:37 +08:00
nopy afbf2e07af Merge branches 'master' and 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-05 17:10:12 +08:00
nopy 37170bbdb2 1 2024-07-05 17:10:09 +08:00
30404 6e3c3e82f9 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-05 15:04:43 +08:00
30404 7e3578391b 123 2024-07-05 15:04:41 +08:00
nopy b16160af10 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-04 19:39:43 +08:00
nopy fbd90a2130 1 2024-07-04 19:39:40 +08:00
30404 71d7956e65 123 2024-07-04 19:38:50 +08:00
30404 2d61b8bf7c 123 2024-07-04 18:34:01 +08:00
30404 e07ebb87cb 231 2024-07-04 18:26:26 +08:00
30404 abe873d7bb qwe 2024-07-04 14:50:25 +08:00
30404 0573e4f702 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-04 10:00:32 +08:00
30404 f0407650bc 123 2024-07-04 10:00:31 +08:00
wang cf9ee7ebe4 1 2024-07-03 19:03:09 +08:00
30404 3219a1ac95 1223123 2024-07-03 14:08:43 +08:00
wang df8ece4dd8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app-dm/src/router/index.jsx
#	python/app.py
#	python/k8s_func.py
2024-07-02 13:02:19 +08:00
30404 e686473d9a 1 2024-07-02 13:00:21 +08:00
wang ce75c0484d 容器部署创建回收 2024-07-02 13:00:00 +08:00
nopy 385044da04 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-01 21:51:58 +08:00
nopy 217197318a 1 2024-07-01 21:51:55 +08:00
30404 4ada04083e 1 2024-07-01 21:50:19 +08:00
nopy 1beb4fdb86 7.1 2024-07-01 21:48:29 +08:00
30404 4a024ccf1a 1 2024-07-01 21:48:24 +08:00
30404 879075474f Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-07-01 20:09:23 +08:00
30404 2420365c72 1 2024-07-01 20:08:58 +08:00
wang fadb4a4ee3 修改webssh 2024-07-01 10:45:49 +08:00
wang cb10f62c35 修改webssh 2024-07-01 10:43:44 +08:00
nopy 915992d8de Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-30 01:37:59 +08:00
nopy 634321d69d 1 2024-06-30 01:37:56 +08:00
30404 dea760fcb9 ok 2024-06-29 22:19:01 +08:00
30404 5c5803e819 1 2024-06-29 22:05:53 +08:00
30404 933069a600 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-29 17:08:01 +08:00
30404 8abf333e13 1 2024-06-29 17:07:59 +08:00
nopy 2b499c9347 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-29 16:36:28 +08:00
nopy ae66adad85 1 2024-06-29 16:36:25 +08:00
30404 f062dfb337 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-29 15:54:40 +08:00
30404 1fca0bad6b 1 2024-06-29 15:54:38 +08:00
nopy 950f670f85 6.29 2024-06-29 13:06:28 +08:00
nopy ee1c6935e0 1 2024-06-29 12:52:17 +08:00
nopy 43bf9d2dc7 1 2024-06-29 12:51:26 +08:00
nopy 0d813ceaf9 1 2024-06-29 12:51:21 +08:00
30404 592adf7cf2 1 2024-06-29 12:30:25 +08:00
30404 15116fb047 练习模块代码优化 2024-06-29 11:58:02 +08:00
nopy 812e94b48a 1 2024-06-27 13:44:10 +08:00
30404 1055dd1807 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-27 13:43:38 +08:00
30404 ba6c387b34 123 2024-06-27 13:43:35 +08:00
nopy 968ff55d9f 1 2024-06-27 10:58:40 +08:00
nopy 0f02b3cd51 1 2024-06-27 10:54:43 +08:00
nopy 2c486a8c0a Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-27 10:53:55 +08:00
nopy 8f2ad47a88 1 2024-06-27 10:53:52 +08:00
30404 e19515008d 1 2024-06-27 10:53:22 +08:00
nopy 4ed8c5cc49 6.27 2024-06-27 10:51:57 +08:00
30404 0f84e3c7ec Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-27 10:51:56 +08:00
30404 a2629e4a2e Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-27 10:51:42 +08:00
30404 af6b9dfd43 6.27 2024-06-27 10:51:37 +08:00
nopy 231606adff Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-26 23:43:36 +08:00
nopy b94b8f52b9 6.26 2024-06-26 23:43:33 +08:00
30404 f13582ce03 小改 2024-06-26 20:04:56 +08:00
nopy 2510e9d8c8 fd 2024-06-26 19:36:30 +08:00
nopy eab8154b0e 1 2024-06-26 19:35:37 +08:00
30404 7313e37fdd 23423 2024-06-26 19:33:29 +08:00
30404 f98c0638bf 2321 2024-06-26 19:33:02 +08:00
nopy 29c15e93d3 Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-26 19:27:10 +08:00
nopy f68fb0f1d9 1 2024-06-26 19:27:06 +08:00
30404 17bd97c9dc 班级管理柱状图90%完成 2024-06-26 14:27:21 +08:00
30404 f32368661b 路由调试 2024-06-26 14:20:24 +08:00
30404 50d36e240a Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm 2024-06-26 11:24:36 +08:00