 c-zhangr1
|
c6609dcb0b
|
Merge remote-tracking branch 'origin/main'
|
2026-08-19 16:43:47 +08:00 |
|
|
c-zhangr1
|
d2321929c2
|
change
|
2026-08-19 16:43:18 +08:00 |
|
 c-zhouhf1
|
f6389f2b67
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-08-19 16:38:19 +08:00 |
|
|
c-zhouhf1
|
6db19f6e9d
|
commit
|
2026-08-19 16:38:07 +08:00 |
|
 c-chenxs1
|
d38d48a147
|
Merge branch 'main' into feature_品牌工作室
|
2026-08-19 09:25:28 +08:00 |
|
|
c-chenxs1
|
1b17c3434b
|
feat: 品牌工作室初始化提交
|
2026-08-19 09:17:12 +08:00 |
|
 =
|
55cd8c86fa
|
commit
|
2026-08-18 15:17:32 +08:00 |
|
 c-chengc1
|
bc783a4beb
|
feat:系统UI优化初版
|
2026-08-17 17:10:33 +08:00 |
|
|
c-zhangr1
|
ac5a2d902e
|
change
|
2026-08-17 11:01:48 +08:00 |
|
|
c-zhouhf1
|
e4485d7b02
|
commit
|
2026-08-13 08:39:26 +08:00 |
|
|
c-chengc1
|
4cf4e45ea2
|
feat:系统UI优化初版
|
2026-08-07 17:08:19 +08:00 |
|
|
=
|
ec900e5b4d
|
commit
|
2026-08-05 10:27:25 +08:00 |
|
|
=
|
d5f4543493
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-08-05 08:43:28 +08:00 |
|
|
=
|
de5f8dc9ba
|
commit
|
2026-08-05 08:35:17 +08:00 |
|
|
c-zhouhf1
|
6e3279e485
|
commit
|
2026-08-04 11:04:15 +08:00 |
|
|
c-chengc1
|
956a76ac63
|
Merge remote-tracking branch 'refs/remotes/origin/feature_风采墙' into feature_界面UI优化
|
2026-08-04 09:07:29 +08:00 |
|
|
c-chengc1
|
98bca06eea
|
feat:UI优化首页初版 - 插图优化
|
2026-08-04 09:06:45 +08:00 |
|
|
c-chengc1
|
f79570cf6b
|
feat:UI优化首页初版
|
2026-08-04 08:46:47 +08:00 |
|
|
c-chengc1
|
29f305d677
|
feat:职代会h5端UI优化调整
|
2026-07-31 17:28:32 +08:00 |
|
 c-duxc1
|
a27075237d
|
web端-风采墙-统计分析: 饼状体和柱状图初始化异常修复;
|
2026-07-31 17:04:00 +08:00 |
|
|
c-duxc1
|
27505e238a
|
web端-新增风采墙模块(工会信息传播与文化展示): 风采展示轮播图样式调整;
|
2026-07-31 16:56:50 +08:00 |
|
|
c-duxc1
|
e00fdc0c78
|
web端-新增风采墙模块(工会信息传播与文化展示): 补充所属工会;统计,内容展示等样式调整;
|
2026-07-31 16:50:17 +08:00 |
|
|
c-chengc1
|
c910752e2e
|
Merge remote-tracking branch 'origin/feature_职代会' into feature_职代会
|
2026-07-31 11:06:59 +08:00 |
|
|
c-chengc1
|
5477355f64
|
feat:职代会h5端文件预览兼容、增加切换届次功能
|
2026-07-31 11:06:45 +08:00 |
|
|
c-duxc1
|
11ae8175c1
|
web端-职代会: 暂时注释投票管理-会议投票'上传资料'按钮,避免文件修改时数据库文件累加至会议资料表;
|
2026-07-31 10:39:57 +08:00 |
|
|
c-duxc1
|
b3406f8b00
|
web端-新增风采墙模块(工会信息传播与文化展示): 修复栏目管理下级栏目无法打开等问题;
|
2026-07-30 16:59:50 +08:00 |
|
|
c-duxc1
|
5043cee747
|
web端-新增风采墙模块(工会信息传播与文化展示);
|
2026-07-30 15:42:06 +08:00 |
|
|
c-duxc1
|
e450b1a7e9
|
web端-活动电子档案: 页面样式调整(弹窗加宽至65%左右);
|
2026-07-30 14:34:02 +08:00 |
|
|
c-duxc1
|
cc71822aae
|
web端-职代会管理: 页面样式调整(弹窗加宽至65%左右);
|
2026-07-30 14:07:18 +08:00 |
|
|
=
|
ff3e8075b5
|
commit
|
2026-07-29 16:50:05 +08:00 |
|
|
c-duxc1
|
058f6b2563
|
web端-职代会管理-投票管理: 页面样式调整;
|
2026-07-29 16:08:05 +08:00 |
|
|
c-duxc1
|
bff78c6ced
|
web端职代会管理: 修复congress_materials职代会资料文件的fileType,fileSize字段为空的问题;
|
2026-07-29 15:56:03 +08:00 |
|
|
c-duxc1
|
8bff6f8ce9
|
新增web端职代会管理(职代会届次取值teacher_congress_session表数据);
|
2026-07-29 14:57:41 +08:00 |
|
|
=
|
e8ed1d93f9
|
commit
|
2026-07-29 13:44:45 +08:00 |
|
|
c-duxc1
|
a93cbc9704
|
Revert "新增活动电子档案模块;"
This reverts commit a8a4052c45.
|
2026-07-28 17:42:37 +08:00 |
|
|
c-duxc1
|
d90f87e453
|
Revert "新增活动电子档案模块;"
This reverts commit b2aef12c84.
|
2026-07-28 17:42:23 +08:00 |
|
|
c-chengc1
|
704bc278fa
|
feat:浦发项目模块迁移-职代会h5端初始化
|
2026-07-28 17:27:29 +08:00 |
|
|
c-duxc1
|
b2aef12c84
|
新增活动电子档案模块;
|
2026-07-28 16:55:02 +08:00 |
|
|
c-duxc1
|
a8a4052c45
|
新增活动电子档案模块;
|
2026-07-28 15:59:45 +08:00 |
|
|
c-chengc1
|
5df36acc22
|
feat:浦发项目模块迁移-重大事项初始化
|
2026-07-28 10:54:28 +08:00 |
|
|
c-zhouhf1
|
785b9a4b80
|
commit
|
2026-07-23 18:30:30 +08:00 |
|
|
c-zhangr1
|
f81544e67f
|
change
|
2026-07-17 10:56:54 +08:00 |
|
|
c-zhangr1
|
0936d61450
|
Merge remote-tracking branch 'origin/main'
|
2026-07-16 15:01:56 +08:00 |
|
|
c-zhangr1
|
65831a02dd
|
change
|
2026-07-16 14:59:53 +08:00 |
|
|
zhouhefeng
|
730b0efebb
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
Conflicts:
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/institution/controller/TeacherCongressInstitutionController.java
src/main/resources/views/platform/zhgh/democratic/teachercongress/institution/basicTable.js
src/main/resources/views/platform/zhgh/democratic/teachercongress/institution/index.html
|
2026-07-15 11:49:49 +08:00 |
|
|
zhouhefeng
|
3425888c91
|
commit
|
2026-07-15 11:47:47 +08:00 |
|
|
=
|
73954cf4e7
|
commit
|
2026-07-15 11:13:08 +08:00 |
|
|
=
|
5c46d07f46
|
Merge remote-tracking branch 'origin/main'
|
2026-07-15 09:24:24 +08:00 |
|
|
=
|
b974d84086
|
commit
|
2026-07-15 09:23:00 +08:00 |
|
|
c-zhouhf1
|
fb25ad45a8
|
commit
|
2026-07-14 18:05:53 +08:00 |
|