Commit Graph

129 Commits

Author SHA1 Message Date
xiao-fajia
6af99fc852 最新代码 2024-08-04 09:00:54 +08:00
xiao-fajia
bbdd8156ef 前端补正 2024-08-03 20:30:55 +08:00
xiao-fajia
7663345f28 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-08-03 15:26:40 +08:00
xiao-fajia
af407925c4 更新代码 2024-08-03 15:26:30 +08:00
xvv
0fc3502cdd 前端补正 2024-08-03 15:24:07 +08:00
xiao-fajia
f414bca291 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-08-03 13:51:56 +08:00
xiao-fajia
162a246cfb 更新代码 2024-08-03 13:51:47 +08:00
xvv
987b1e9cd7 前端补正 2024-08-03 13:48:02 +08:00
xiao-fajia
7659142621 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-08-02 20:01:13 +08:00
xiao-fajia
258a1c653d 更新代码,封装分页组件 2024-08-02 20:01:04 +08:00
xvv
f2312fd5f1 前端补正 2024-08-02 17:46:14 +08:00
xiao-fajia
602e2984a4 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-08-02 16:40:22 +08:00
xiao-fajia
e45aa1642d 更新代码 2024-08-02 16:40:13 +08:00
xvv
dc25681010 前端补正 2024-08-02 16:38:43 +08:00
xvv
8506989c79 前端补正 2024-08-02 16:14:37 +08:00
xvv
8b8c9363dd 前端补正 2024-08-02 08:22:21 +08:00
xiao-fajia
570c5f785c 更新代码 2024-08-01 21:33:13 +08:00
xiao-fajia
1b3860a5c7 更新代码 2024-08-01 19:33:23 +08:00
xvv
7695ef585e Merge remote-tracking branch 'origin/main' 2024-08-01 19:31:51 +08:00
xvv
bbcea1de70 前端补正 2024-08-01 19:31:37 +08:00
xiao-fajia
e0310b7f21 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-08-01 19:22:38 +08:00
xiao-fajia
ceba19f251 更新代码 2024-08-01 19:21:05 +08:00
xvv
ff273f9a40 前端补正 2024-08-01 19:19:11 +08:00
xvv
67eb86025b 前端补正 2024-08-01 13:44:32 +08:00
愉快的大福
2746bde28b 描述 2024-08-01 11:46:48 +08:00
xvv
aa27d8475c 前端补正 2024-08-01 09:32:11 +08:00
xiao-fajia
fd952b5462 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-31 18:04:06 +08:00
xiao-fajia
1dab7230f3 修复杂项 2024-07-31 18:04:00 +08:00
“hhk”
b8f7311e67 数据穿透优化 2024-07-31 11:56:46 +08:00
xiao-fajia
ad17736e30 修复杂项 2024-07-31 09:43:45 +08:00
xiao-fajia
c52a3bbcce 设置表格默认属性 2024-07-31 09:01:11 +08:00
xiao-fajia
9ff340e303 新增可自定义表格宽度 2024-07-30 19:42:09 +08:00
xiao-fajia
d4db130917 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-30 19:18:40 +08:00
xiao-fajia
b69760e370 修正一级栏目可发内容 2024-07-30 19:18:34 +08:00
“hhk”
8374281574 优化 2024-07-30 18:41:45 +08:00
“hhk”
4b131de229 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-30 18:10:37 +08:00
“hhk”
3674666b1d 优化 2024-07-30 18:10:33 +08:00
xiao-fajia
b3f0d7f3a8 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-30 17:49:28 +08:00
xiao-fajia
bb9a006e3d 修正杂项 2024-07-30 17:49:20 +08:00
“hhk”
9fc114d972 教学成果数据穿透 2024-07-30 15:29:51 +08:00
“hhk”
bb81f1e59c 功能暂提 2024-07-30 15:01:42 +08:00
xvv
6836af3090 前端补正 2024-07-30 11:07:46 +08:00
xvv
d7485379f8 前端补正 2024-07-30 10:25:51 +08:00
xiao-fajia
a9840600c0 发布bug修复 2024-07-30 09:25:39 +08:00
xiao-fajia
686e22741b Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-29 19:21:43 +08:00
xiao-fajia
cff0b3d326 修改后台默认主页内容 2024-07-29 19:21:36 +08:00
“hhk”
b322a21747 数据接口对接 2024-07-29 19:00:42 +08:00
“hhk”
4853dcf1ca Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-29 16:50:52 +08:00
“hhk”
e0b7c4f753 二级栏目暂提 2024-07-29 16:50:33 +08:00
xiao-fajia
5f7fa198ca Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-29 16:42:33 +08:00
xiao-fajia
a9481db8e5 内容bug修复 2024-07-29 16:42:21 +08:00
xvv
7e8a2e7c1b 前端补正 2024-07-29 16:39:28 +08:00
xvv
1c5c9b9811 前端补正 2024-07-29 16:15:31 +08:00
“hhk”
b5a4a41b99 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website
# Conflicts:
#	ruoyi-ui/src/views/officialWebsite/platform.vue
#	ruoyi-ui/src/views/officialWebsite/teaching.vue
2024-07-29 14:36:36 +08:00
“hhk”
908a9d281e 暂提 2024-07-29 14:34:34 +08:00
xvv
012a96aec0 前端补正 2024-07-29 14:30:06 +08:00
xvv
834ccef6ea 前端补正 2024-07-29 11:08:00 +08:00
“hhk”
1fbd3799bf Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-29 09:36:57 +08:00
“hhk”
2235a78db8 接口对接 2024-07-29 09:36:51 +08:00
xiao-fajia
8b4a0d0009 新增报名信息管理 2024-07-27 18:02:04 +08:00
xiao-fajia
b18d595d0f 新增基础信息管理、大赛管理 2024-07-26 18:59:02 +08:00
xiao-fajia
8402565665 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website
 Conflicts:
	ruoyi-ui/src/views/home.vue
2024-07-26 10:38:54 +08:00
xiao-fajia
7508ebf5e0 文章CRUD 2024-07-26 10:29:33 +08:00
xvv
9ab25d98c7 前端补正 2024-07-26 10:27:33 +08:00
xiao-fajia
dca36af934 文章CRUD 2024-07-25 20:56:17 +08:00
xvv
d1f96eeed2 前端补正 2024-07-25 10:03:15 +08:00
xiao-fajia
db309a2740 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-24 17:24:57 +08:00
xiao-fajia
67ea39901c 文章新增、修改待完成 2024-07-24 17:24:35 +08:00
xvv
790fb0d856 前端补正 2024-07-24 16:30:01 +08:00
xvv
cfc22c5d6a 前端补正 2024-07-23 23:18:55 +08:00
xiao-fajia
8d500a947b 首页接口 2024-07-23 20:36:09 +08:00
xiao-fajia
bceca96070 Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website 2024-07-23 18:07:35 +08:00
xiao-fajia
bd99606db1 文章管理 2024-07-23 18:07:10 +08:00
xvv
f7d6369f39 前端 2024-07-23 17:20:45 +08:00
xvv
dc6fcfe081 前端 2024-07-23 17:01:27 +08:00
xvv
63b12cba04 前端 2024-07-23 16:36:42 +08:00
xvv
2fdf43309c 前端 2024-07-23 15:11:58 +08:00
xiao-fajia
854d6ab28d 文章管理1/2 2024-07-22 17:30:34 +08:00
xiao-fajia
a4bca70d1d init 2024-07-22 11:21:29 +08:00