 c-chengc1
|
6b0b6bf0ad
|
Merge remote-tracking branch 'origin/feature_会员模块UI优化' into release_20260831
|
2026-09-01 10:56:05 +08:00 |
|
 c-zhangr1
|
458aeeb6c8
|
fix_会员模块UI测试整改：页面卡片标题栏优化，查看、审核按钮需要从右向左抽屉式打开
|
2026-09-01 10:40:36 +08:00 |
|
|
c-chengc1
|
3bfbb52470
|
Merge branch 'feature_程诚_0831问题修复' into release_20260831
|
2026-09-01 10:34:54 +08:00 |
|
|
c-chengc1
|
b46a665322
|
feat:职工福利-选择列表过滤非套餐数据，返回栏样式统一，图片缺失占位样式
|
2026-09-01 10:34:13 +08:00 |
|
|
c-chengc1
|
dc4a733af5
|
Merge remote-tracking branch 'origin/feature_疗休养模块UI优化' into release_20260831
|
2026-08-31 18:05:55 +08:00 |
|
|
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-zhangr1
|
75357eed1f
|
移动端疗休养模块UI优化
|
2026-08-31 16:38:27 +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
|
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
|
0d944da8b5
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-30 15:53:38 +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
|
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-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-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-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 |
|
|
c-chengc1
|
ef68070afd
|
Merge branch 'refs/heads/feature_职代会' into release_20260829
# Conflicts:
# src/main/resources/views/layouts/platform_h5.html
|
2026-08-29 08:48:32 +08:00 |
|
|
c-chengc1
|
58218ad9c4
|
feat:首页推荐服务按钮布局适配（换行）
|
2026-08-29 08:45:39 +08:00 |
|
|
c-zhouhf1
|
37f874f31d
|
问卷整改
|
2026-08-28 17:00:42 +08:00 |
|
|
c-chengc1
|
c8f80c8d5a
|
Merge branch 'refs/heads/feature_主分支合并UI优化'
|
2026-08-26 15:02:18 +08:00 |
|
|
c-chengc1
|
ccc9b518da
|
feat:职工福利ui优化
|
2026-08-26 15:01:10 +08:00 |
|
|
c-zhouhf1
|
0a0840c5d2
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-08-26 13:57:48 +08:00 |
|
|
c-zhouhf1
|
7509a9467c
|
移植杭医版生日祝福
|
2026-08-26 13:57:37 +08:00 |
|
|
c-zhangr1
|
58273be5c9
|
Merge remote-tracking branch 'origin/main'
|
2026-08-26 13:55:59 +08:00 |
|
|
c-zhangr1
|
1d5061e39a
|
change
|
2026-08-26 13:55:37 +08:00 |
|