 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
|
cc71822aae
|
web端-职代会管理: 页面样式调整(弹窗加宽至65%左右);
|
2026-07-30 14:07:18 +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 |
|
|
c-chengc1
|
704bc278fa
|
feat:浦发项目模块迁移-职代会h5端初始化
|
2026-07-28 17:27:29 +08:00 |
|
 c-zhouhf1
|
785b9a4b80
|
commit
|
2026-07-23 18:30:30 +08:00 |
|
|
c-zhouhf1
|
86ab0142da
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-07-22 13:55:54 +08:00 |
|
|
c-zhouhf1
|
6b4a3c0525
|
commit
|
2026-07-22 13:52:20 +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 |
|
|
c-zhangr1
|
cbc0dcf67d
|
change普惠疗休养
|
2026-07-14 17:41:39 +08:00 |
|
|
c-zhouhf1
|
33a9a3df05
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-07-14 16:41:16 +08:00 |
|
|
c-zhouhf1
|
2168888ca7
|
commit
|
2026-07-14 16:40:42 +08:00 |
|
|
=
|
2f8158a658
|
Merge remote-tracking branch 'origin/main'
|
2026-07-14 16:36:44 +08:00 |
|
|
c-zhangr1
|
71558c3df8
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitRead/index.html
|
2026-07-14 16:31:37 +08:00 |
|
|
c-zhangr1
|
68d8045179
|
1
|
2026-07-14 16:30:12 +08:00 |
|
|
=
|
5626139605
|
commit
|
2026-07-14 16:29:59 +08:00 |
|
|
c-zhouhf1
|
33687bbd66
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-07-14 16:28:31 +08:00 |
|
|
c-zhouhf1
|
f39735f1f2
|
commit
|
2026-07-14 16:28:22 +08:00 |
|
|
c-zhangr1
|
924feefdeb
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/main/resources/db/menu/init_tour_menu.sql
# src/main/resources/db/tour_setting_create.sql
# src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
# src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
# src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js
|
2026-07-14 16:27:39 +08:00 |
|
|
c-zhangr1
|
c7503cd4cc
|
1
|
2026-07-14 16:24:26 +08:00 |
|
|
=
|
c504830db3
|
commit
|
2026-07-14 16:20:40 +08:00 |
|
|
c-zhangr1
|
fe250baef8
|
1
|
2026-07-14 14:35:17 +08:00 |
|
|
c-zhangr1
|
93ef06cfe6
|
1
|
2026-07-14 14:34:34 +08:00 |
|
|
=
|
24e2d9e826
|
commit
|
2026-07-14 09:19:04 +08:00 |
|
|
zhouhefeng
|
9b4f4d57be
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-07-14 09:15:41 +08:00 |
|
|
zhouhefeng
|
8da7d2f3b4
|
Changes
|
2026-07-14 09:15:34 +08:00 |
|
|
zhouhefeng
|
cadd4bbffe
|
Changes
|
2026-07-14 09:12:00 +08:00 |
|
|
zhouhefeng
|
4475404f70
|
Changes
|
2026-07-10 08:42:57 +08:00 |
|
|
c-zhouhf1
|
783e2b1fb0
|
commit
|
2026-07-08 15:28:09 +08:00 |
|
|
c-zhouhf1
|
f7f239c68b
|
commit
|
2026-07-08 09:51:11 +08:00 |
|
|
c-zhangr1
|
37a17972af
|
Merge remote-tracking branch 'origin/main'
|
2026-07-08 09:26:37 +08:00 |
|
|
c-zhangr1
|
1a64de529e
|
1
|
2026-07-08 09:26:27 +08:00 |
|
|
c-zhouhf1
|
ac891ce87e
|
commit
|
2026-07-08 09:16:21 +08:00 |
|
|
c-zhouhf1
|
e80ec00183
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-07-07 15:16:11 +08:00 |
|
|
c-zhouhf1
|
cc5a944b47
|
commit
|
2026-07-07 15:15:26 +08:00 |
|
|
=
|
635038b25c
|
commit
|
2026-07-07 10:24:37 +08:00 |
|
|
=
|
34627245ac
|
commit
|
2026-07-03 17:25:27 +08:00 |
|
|
c-zhouhf1
|
6380842b34
|
commit
|
2026-07-03 17:10:35 +08:00 |
|
|
=
|
2e3c3e87da
|
commit
|
2026-07-01 09:21:06 +08:00 |
|