 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
|
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-zhouhf1
|
013833bc58
|
我的签字自动回显
|
2026-08-26 14:43:35 +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 |
|
|
c-zhangr1
|
368c0b2ec8
|
change
|
2026-08-26 13:55:08 +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-zhouhf1
|
e57b712134
|
整改慰问UI
|
2026-08-26 08:51:33 +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-zhouhf1
|
b81c59dc86
|
整改提案UI
|
2026-08-25 15:58:05 +08:00 |
|
|
c-zhangr1
|
9503b5aa73
|
change
|
2026-08-25 13:50:47 +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-zhouhf1
|
6815fb7f38
|
整改提案UI
|
2026-08-24 18:07:41 +08:00 |
|
|
c-zhouhf1
|
0fed9f3fc8
|
整改福利UI
|
2026-08-24 14:06:21 +08:00 |
|
|
c-zhangr1
|
33252a7225
|
Merge remote-tracking branch 'origin/main'
|
2026-08-21 15:05:34 +08:00 |
|
|
c-zhangr1
|
06893cf3e9
|
change
|
2026-08-21 14:58:15 +08:00 |
|
 =
|
52d28a0d6d
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-08-21 08:39:48 +08:00 |
|
|
=
|
6dc7c09786
|
commit
|
2026-08-21 08:39:18 +08:00 |
|
|
c-zhouhf1
|
fac819eb00
|
整改提案查看样式
|
2026-08-20 17:48:53 +08:00 |
|
|
c-zhangr1
|
b556fdacc5
|
Merge remote-tracking branch 'origin/main'
|
2026-08-20 17:26:55 +08:00 |
|
|
c-zhangr1
|
24cc40c698
|
change
|
2026-08-20 17:26:14 +08:00 |
|
|
=
|
05a7d3320e
|
commit
|
2026-08-20 16:46:13 +08:00 |
|
|
c-zhouhf1
|
4803c7320e
|
commit
|
2026-08-20 16:41:26 +08:00 |
|
|
=
|
e07ed664f1
|
commit
|
2026-08-20 15:43:53 +08:00 |
|
|
c-zhangr1
|
840f7e2a59
|
Merge remote-tracking branch 'origin/main'
|
2026-08-20 10:55:34 +08:00 |
|
|
c-zhangr1
|
7622e414b6
|
change
|
2026-08-20 10:55:26 +08:00 |
|
|
c-zhangr1
|
34fe53caf9
|
change
|
2026-08-20 10:55:04 +08:00 |
|
|
c-zhouhf1
|
de46a2404d
|
commit
|
2026-08-20 09:59:14 +08:00 |
|
|
=
|
681d8c6e81
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-08-20 08:40:44 +08:00 |
|
|
=
|
9d6e6eb189
|
commit
|
2026-08-20 08:39:10 +08:00 |
|
|
c-zhouhf1
|
a359a01790
|
commit
|
2026-08-20 08:35:36 +08:00 |
|
|
c-zhouhf1
|
db33fd0bbd
|
commit
|
2026-08-19 17:59:41 +08:00 |
|
|
c-chengc1
|
2b44463d93
|
feat:体育活动、文化活动、品牌活动、系统金刚区 UI优化
|
2026-08-19 17:20:28 +08:00 |
|
|
=
|
c6d0f5b7d4
|
commit
|
2026-08-19 16:58:43 +08:00 |
|
|
c-zhangr1
|
c6609dcb0b
|
Merge remote-tracking branch 'origin/main'
|
2026-08-19 16:43:47 +08:00 |
|
|
c-zhangr1
|
d2321929c2
|
change
|
2026-08-19 16:43:18 +08:00 |
|
|
c-zhouhf1
|
f6389f2b67
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-08-19 16:38:19 +08:00 |
|
|
c-zhouhf1
|
6db19f6e9d
|
commit
|
2026-08-19 16:38:07 +08:00 |
|
|
=
|
55cd8c86fa
|
commit
|
2026-08-18 15:17:32 +08:00 |
|
|
c-chengc1
|
bc783a4beb
|
feat:系统UI优化初版
|
2026-08-17 17:10:33 +08:00 |
|