 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 |
|