 c-chengc1
|
e8ce6eef83
|
Merge remote-tracking branch 'origin/release_20260831' into release_20260831
|
2026-08-31 18:05:01 +08:00 |
|
|
c-chengc1
|
8b3bc19757
|
feat:职代会文件类型筛选去除图片、压缩包；文件预览支持ppt；查看已投票样式优化；
|
2026-08-31 18:04:14 +08:00 |
|
 c-chenxs1
|
5e5ac081d2
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-31 17:51:50 +08:00 |
|
|
c-chenxs1
|
4c57dda909
|
feat: 会议选座样式优化-4
|
2026-08-31 17:51:01 +08:00 |
|
|
c-chengc1
|
bbf2bb798d
|
feat:新版菜单图标更新脚本
|
2026-08-31 17:16:33 +08:00 |
|
|
c-chengc1
|
b3234fa64b
|
feat:职代会h5查询切换届次列表去除过滤开启状态
|
2026-08-31 17:16:12 +08:00 |
|
|
c-chengc1
|
3f741ebab6
|
Merge remote-tracking branch 'origin/release_20260831' into release_20260831
|
2026-08-31 15:30:03 +08:00 |
|
 c-zhouhf1
|
2341b136ca
|
品牌活动报名统计增加校工会活动管理员看全部活动
不是超级管理员加不了角色
|
2026-08-31 15:20:00 +08:00 |
|
|
c-chengc1
|
120f0bd046
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-31 13:36:12 +08:00 |
|
|
c-chenxs1
|
f6834bb969
|
feat: 会议选座样式优化-3
|
2026-08-31 12:03:53 +08:00 |
|
|
c-chenxs1
|
a21007bada
|
feat: 会议选座样式优化-2
|
2026-08-31 11:54:17 +08:00 |
|
|
c-chengc1
|
5f20d703e4
|
Merge remote-tracking branch 'origin/feature_提案&困难帮扶&作品征集UI优化' into release_20260831
|
2026-08-31 11:14:20 +08:00 |
|
|
c-chengc1
|
f7b41ee709
|
Merge remote-tracking branch 'origin/feature_工会报销UI优化' into release_20260831
|
2026-08-31 11:14:13 +08:00 |
|
|
c-chengc1
|
0d5223e6c7
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-31 09:07:09 +08:00 |
|
|
c-chengc1
|
f89b0f643d
|
feat:代表证卡套样式优化；消息中心、待办中心样式优化
|
2026-08-30 17:59:02 +08:00 |
|
|
c-chenxs1
|
c4713ae117
|
feat: 会议选座样式优化-图片
|
2026-08-30 17:53:01 +08:00 |
|
|
c-chenxs1
|
199a96130c
|
feat: 会议选座样式优化
|
2026-08-30 17:52:43 +08:00 |
|
 c-hongqw1
|
24c0957f59
|
地大工会报销手机端UI优化
|
2026-08-30 17:50:00 +08:00 |
|
|
c-zhouhf1
|
58921d9bb2
|
整改提案
整改慰问增加骨架屏
整改作品征集
整改困难帮扶
|
2026-08-30 17:04:37 +08:00 |
|
|
c-chengc1
|
5f73c6a7a3
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-30 16:03:12 +08:00 |
|
|
c-chenxs1
|
d6a9f9aeef
|
feat: 会议选座、代表阅览-sql
|
2026-08-30 16:02:50 +08:00 |
|
|
c-chengc1
|
0d944da8b5
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-30 15:53:38 +08:00 |
|
|
c-chenxs1
|
6124e33edb
|
feat: 会议选座、代表阅览2
|
2026-08-30 15:49:13 +08:00 |
|
|
c-chenxs1
|
b0182731bd
|
feat: 会议选座、代表阅览
|
2026-08-30 15:49:07 +08:00 |
|
|
c-chengc1
|
479074d684
|
Merge remote-tracking branch 'origin/feature_会员模块UI优化' into release_20260831
|
2026-08-30 14:41:59 +08:00 |
|
|
c-chengc1
|
81912befab
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-30 14:40:14 +08:00 |
|
|
c-chengc1
|
4efbfe40ac
|
Merge remote-tracking branch 'origin/feature_职代会UI优化' into release_20260831
|
2026-08-30 14:39:27 +08:00 |
|
|
c-chengc1
|
6573043dae
|
Merge remote-tracking branch 'origin/feature_社团组织管理UI优化' into release_20260831
|
2026-08-30 14:38:18 +08:00 |
|
|
c-chengc1
|
e41b1966b6
|
Merge remote-tracking branch 'origin/feature_品牌工作室' into release_20260831
|
2026-08-30 14:37:47 +08:00 |
|
|
c-chengc1
|
b026020ae8
|
Merge remote-tracking branch 'origin/dev-mall' into release_20260831
|
2026-08-30 14:37:18 +08:00 |
|
|
c-chengc1
|
7ae67a46a5
|
feat:职代会ui优化
|
2026-08-30 14:34:42 +08:00 |
|
 c-zhangr1
|
4db67dfccf
|
移动端人员管理模块UI优化
|
2026-08-30 13:58:47 +08:00 |
|
 =
|
760bc1a33c
|
手机端社团UI优化
|
2026-08-30 11:53:51 +08:00 |
|
|
=
|
bc8f23a61d
|
手机端社团UI优化
|
2026-08-30 11:11:29 +08:00 |
|
|
c-chenxs1
|
ec54e3fc0d
|
feat: 代表团凭证展示优化
|
2026-08-29 17:40:45 +08:00 |
|
|
c-chenxs1
|
b1cd738a53
|
Merge remote-tracking branch 'refs/remotes/origin/feature_主分支合并UI优化' into feature_教代会代表证
# Conflicts:
# src/main/java/com/budwk/app/sys/controller/SysConfController.java
|
2026-08-29 16:27:12 +08:00 |
|
|
c-chenxs1
|
f2fb656912
|
feat: 代表团凭证
|
2026-08-29 16:23:09 +08:00 |
|
|
c-chenxs1
|
97d94bc702
|
feat: 品牌工作室菜单脚本提交
|
2026-08-29 10:27:31 +08:00 |
|
|
c-chenxs1
|
31f4e5c4a6
|
feat: 积分商城菜单脚本提交
|
2026-08-29 10:25:51 +08:00 |
|
|
c-chengc1
|
35ea26b750
|
Merge remote-tracking branch 'origin/feature_职代会' into feature_职代会UI优化
# Conflicts:
# src/main/resources/views/layouts/platform_h5.html
|
2026-08-29 10:16:55 +08:00 |
|
|
c-chengc1
|
7d2bf71d36
|
Merge remote-tracking branch 'origin/feature_活动电子档案' into release_20260829
|
2026-08-29 09:50:22 +08:00 |
|
 c-duxc1
|
17e8379903
|
活动电子档案代码重发;
|
2026-08-29 09:39:34 +08:00 |
|
|
c-duxc1
|
fae24dfecd
|
Merge branch 'main' into feature_活动电子档案
# Conflicts:
# src/main/resources/views/platform/zhgh/archive/docType/index.html
# src/main/resources/views/platform/zhgh/archive/filing/index.html
# src/main/resources/views/platform/zhgh/archive/project/index.html
|
2026-08-29 09:29:50 +08:00 |
|
|
c-chengc1
|
51c38e4f30
|
Merge branch 'feature_品牌工作室' into release_20260829
|
2026-08-29 09:19:17 +08:00 |
|
|
c-chengc1
|
60c3183d29
|
Merge remote-tracking branch 'refs/remotes/origin/dev-mall' into release_20260829
# Conflicts:
# src/main/java/com/budwk/app/sys/controller/v4/SysV4MsgController.java
# src/main/resources/views/platform/zhghh5/sys/home/msg.js
|
2026-08-29 09:12:07 +08:00 |
|
|
c-chenxs1
|
67bcbfc737
|
feat: 品牌工作室脚本提交
|
2026-08-29 09:08:14 +08:00 |
|
|
c-chengc1
|
c8461e6be5
|
Merge remote-tracking branch 'origin/feature_主分支合并UI优化' into release_20260829
|
2026-08-29 08:54:49 +08:00 |
|
|
c-chengc1
|
b5e7a26fdd
|
Merge remote-tracking branch 'origin/feature_重大事项' into release_20260829
|
2026-08-29 08:54:06 +08:00 |
|
|
c-chengc1
|
cac1453547
|
Merge remote-tracking branch 'origin/feature_活动电子档案' into release_20260829
# Conflicts:
# src/main/resources/views/platform/zhgh/archive/docType/index.html
# src/main/resources/views/platform/zhgh/archive/filing/index.html
# src/main/resources/views/platform/zhgh/archive/project/index.html
|
2026-08-29 08:53:45 +08:00 |
|
|
c-chengc1
|
c9f8e852b2
|
Merge remote-tracking branch 'refs/remotes/origin/feature_品牌工作室' into release_20260829
|
2026-08-29 08:52:42 +08:00 |
|