Commit Graph
235 Commits
Author SHA1 Message Date
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-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
c-zhangr1 ac5a2d902e change 2026-08-17 11:01:48 +08:00
c-zhouhf1 e4485d7b02 commit 2026-08-13 08:39:26 +08:00
c-chengc1 4cf4e45ea2 feat:系统UI优化初版 2026-08-07 17:08:19 +08:00
= ec900e5b4d commit 2026-08-05 10:27:25 +08:00
= d5f4543493 Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-08-05 08:43:28 +08:00
= de5f8dc9ba commit 2026-08-05 08:35:17 +08:00
c-zhouhf1 6e3279e485 commit 2026-08-04 11:04:15 +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-duxc1 a27075237d web端-风采墙-统计分析: 饼状体和柱状图初始化异常修复; 2026-07-31 17:04:00 +08:00
c-duxc1 27505e238a web端-新增风采墙模块(工会信息传播与文化展示): 风采展示轮播图样式调整; 2026-07-31 16:56:50 +08:00
c-duxc1 e00fdc0c78 web端-新增风采墙模块(工会信息传播与文化展示): 补充所属工会;统计,内容展示等样式调整; 2026-07-31 16:50:17 +08:00
c-duxc1 b3406f8b00 web端-新增风采墙模块(工会信息传播与文化展示): 修复栏目管理下级栏目无法打开等问题; 2026-07-30 16:59:50 +08:00
c-duxc1 5043cee747 web端-新增风采墙模块(工会信息传播与文化展示); 2026-07-30 15:42:06 +08:00
= ff3e8075b5 commit 2026-07-29 16:50:05 +08:00
= e8ed1d93f9 commit 2026-07-29 13:44:45 +08:00
c-duxc1 a93cbc9704 Revert "新增活动电子档案模块;"
This reverts commit a8a4052c45.
2026-07-28 17:42:37 +08:00