 c-chengc1
|
07e42bc98c
|
Merge remote master into local project
|
2026-10-27 11:45:15 +08:00 |
|
 程诚
|
75045b3544
|
fix:工会管理表单搜索人员缓存问题修复；会员变更查询数据序号异常问题修复
|
2026-10-26 07:49:31 +08:00 |
|
|
c-chengc1
|
5671737c9e
|
feat:web首页优化，用户关联角色过多会撑高上方信息区域
|
2026-10-21 16:49:02 +08:00 |
|
|
c-chengc1
|
47e7a71310
|
fix：1、我的学习增加返回按钮
|
2026-10-20 16:25:44 +08:00 |
|
|
c-chengc1
|
ef9a6eddd5
|
Merge remote-tracking branch 'origin/master'
|
2026-10-20 14:02:59 +08:00 |
|
|
c-chengc1
|
f09a2faf1f
|
fix：1、登录密码校验注释；2、工会报销-我的报销查询数据范围修复；3、工会报销数据接口权限范围和菜单权限范围保持一致；4、工会管理表格高度固定内部滚动
|
2026-10-20 14:02:47 +08:00 |
|
|
c-chengc1
|
e0e7dcfa05
|
feat:体检模块图片圆角样式
|
2026-10-17 17:06:50 +08:00 |
|
|
c-chengc1
|
ed2919f4e5
|
feat:会员入会-增加已有申请进行中判断逻辑
|
2026-10-17 16:13:21 +08:00 |
|
|
c-chengc1
|
010d56e348
|
feat:工会报销-社团活动附件说明不再复用文体活动的附件说明
|
2026-10-17 15:33:18 +08:00 |
|
|
c-chengc1
|
15c39aad69
|
Merge remote-tracking branch 'origin/master' into feature_经费管理整改
|
2026-10-17 14:18:42 +08:00 |
|
|
c-chengc1
|
3ffa1454b1
|
feat:优化社团入会
|
2026-10-17 14:17:41 +08:00 |
|
|
c-chengc1
|
453a8d24f1
|
feat:h5会员入会是否已是会员校验、操作栏按钮取消隐藏；h5体检模块：体检项目、我的体检界面卡片样式优化；
|
2026-10-16 17:22:03 +08:00 |
|
|
c-chengc1
|
143d9eb0ce
|
feat:h5首页工会动态模块恢复左右滑动样式
|
2026-10-16 15:21:07 +08:00 |
|
|
c-chengc1
|
c1dfe9b7a1
|
feat:工会报销：1、报销申请增加协会报销，增加社团活动；2、协会报销关联经费管理-社团预算；3、文体活动、日常活动报销，去除附件必填校验；4、活动增加报销金额，报销金额小于发票金额；5、报销审核、汇总，表格中增加流水号字段，所属单位隐藏
|
2026-10-16 14:30:51 +08:00 |
|
|
c-chengc1
|
4ea3ff8ac4
|
feat:慰问打印去掉二维码，加上流水号（按年月日编号自动编号，例如20261009001，后三位“001”按申请时间自动递增）
|
2026-10-16 09:00:51 +08:00 |
|
|
c-chengc1
|
f70f1b6177
|
Merge remote-tracking branch 'origin/feature_样式优化'
|
2026-09-29 10:02:35 +08:00 |
|
|
c-chengc1
|
7c7920b378
|
feat:首页样式优化，增加应用-我的收藏
|
2026-09-29 10:00:40 +08:00 |
|
|
c-chengc1
|
c3ea84bfad
|
fix:20260904代码扫描漏洞问题修复
|
2026-09-11 16:28:57 +08:00 |
|
|
c-chengc1
|
61b8819057
|
fix:20260904代码扫描漏洞问题修复
|
2026-09-11 14:04:30 +08:00 |
|
|
c-chengc1
|
01921f7fcf
|
fix:20260904代码扫描漏洞问题修复
|
2026-09-09 10:55:31 +08:00 |
|
|
c-chengc1
|
465a3257b5
|
fix:20260904代码扫描漏洞问题修复
|
2026-09-09 10:25:53 +08:00 |
|
|
c-chengc1
|
45410cb0a3
|
Merge remote-tracking branch 'origin/feature_工会报销UI优化' into feature_工会报销UI优化
|
2026-09-04 16:16:09 +08:00 |
|
|
c-chengc1
|
43ae24dceb
|
Merge remote-tracking branch 'origin/feature_程诚_0831问题修复' into release_20260831
|
2026-09-02 16:27:12 +08:00 |
|
|
c-chengc1
|
cccad1a852
|
fix:职代会pc端修复投票纪录无法正常显示工会、代表团
|
2026-09-02 16:26:38 +08:00 |
|
|
c-chengc1
|
0b3fef4d71
|
Merge remote-tracking branch 'origin/feature_工会报销UI优化' into release_20260831
|
2026-09-02 11:43:11 +08:00 |
|
|
c-chengc1
|
2de6820c1a
|
Merge remote-tracking branch 'origin/feature_周何峰' into release_20260831
|
2026-09-02 09:20:52 +08:00 |
|
|
c-chengc1
|
d305317458
|
Merge branch 'feature_程诚_0831问题修复' into release_20260831
|
2026-09-01 16:00:47 +08:00 |
|
|
c-chengc1
|
982065c424
|
feat:职工福利PC端系统默认选择改为复选框组件；职代会PC端投票统计结果显示不正确问题修复；体育活动h5分工会报名权限提示；品牌活动h5联系人字段超长样式适配修复；
|
2026-09-01 16:00:11 +08:00 |
|
|
c-chengc1
|
a92f75730d
|
feat:职工福利ui优化，我的福利支持修改福利
|
2026-09-01 15:04:19 +08:00 |
|
|
c-chengc1
|
6b0b6bf0ad
|
Merge remote-tracking branch 'origin/feature_会员模块UI优化' into release_20260831
|
2026-09-01 10:56:05 +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-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-chengc1
|
120f0bd046
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-31 13:36:12 +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-chengc1
|
5f73c6a7a3
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-30 16:03:12 +08:00 |
|
|
c-chengc1
|
0d944da8b5
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-30 15:53:38 +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-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-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-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-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-chengc1
|
49c34cf226
|
feat:文化活动表单样式优化
|
2026-08-26 13:51:31 +08:00 |
|
|
c-chengc1
|
0dd3a66a90
|
Merge remote-tracking branch 'origin/feature_主分支合并UI优化' into feature_主分支合并UI优化
|
2026-08-26 13:50:26 +08:00 |
|
|
c-chengc1
|
cc2b3b8ab5
|
feat:职工福利ui优化
|
2026-08-26 13:50:12 +08:00 |
|
|
c-chengc1
|
6678ca6a5a
|
feat:首页普惠信息插画优化
|
2026-08-25 16:25:17 +08:00 |
|
|
c-chengc1
|
8e3752dd2d
|
feat:首页普惠信息插画优化
|
2026-08-25 16:23:08 +08:00 |
|
|
c-chengc1
|
159f081f3f
|
feat:应用中心底部导航栏遮挡问题修复
|
2026-08-25 16:19:36 +08:00 |
|
|
c-chengc1
|
e83f1317a4
|
Merge branch 'refs/heads/feature_界面UI优化' into feature_主分支合并UI优化
# Conflicts:
# src/main/resources/views/platform/zhghh5/democratic/proposal/query/comprehensive/index.html
# src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html
# src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html
# src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html
# src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html
# src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html
# src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
# src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html
# src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html
|
2026-08-25 10:17:05 +08:00 |
|
|
c-chengc1
|
34726c2b11
|
Merge remote-tracking branch 'origin/feature_界面UI优化' into feature_界面UI优化
|
2026-08-25 10:09:17 +08:00 |
|
|
c-chengc1
|
707325c86e
|
feat:亲子活动UI优化，首页按钮布局优化、插画优化
|
2026-08-25 10:08:57 +08:00 |
|
|
c-chengc1
|
2b44463d93
|
feat:体育活动、文化活动、品牌活动、系统金刚区 UI优化
|
2026-08-19 17:20:28 +08:00 |
|
|
c-chengc1
|
bc783a4beb
|
feat:系统UI优化初版
|
2026-08-17 17:10:33 +08:00 |
|
|
c-chengc1
|
4cf4e45ea2
|
feat:系统UI优化初版
|
2026-08-07 17:08:19 +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-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-chengc1
|
704bc278fa
|
feat:浦发项目模块迁移-职代会h5端初始化
|
2026-07-28 17:27:29 +08:00 |
|
|
c-chengc1
|
5df36acc22
|
feat:浦发项目模块迁移-重大事项初始化
|
2026-07-28 10:54:28 +08:00 |
|