Commit Graph
48 Commits
Author SHA1 Message Date
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-zhouhf1 013833bc58 我的签字自动回显 2026-08-26 14:43:35 +08:00
c-zhouhf1 7509a9467c 移植杭医版生日祝福 2026-08-26 13:57:37 +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 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 707325c86e feat:亲子活动UI优化,首页按钮布局优化、插画优化 2026-08-25 10:08:57 +08:00
c-zhouhf1 0fed9f3fc8 整改福利UI 2026-08-24 14:06:21 +08:00
c-zhangr1 24cc40c698 change 2026-08-20 17:26:14 +08:00
c-zhouhf1 4803c7320e commit 2026-08-20 16:41:26 +08:00
c-zhouhf1 de46a2404d commit 2026-08-20 09:59:14 +08:00
c-chengc1 2b44463d93 feat:体育活动、文化活动、品牌活动、系统金刚区 UI优化 2026-08-19 17:20:28 +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-zhouhf1 e4485d7b02 commit 2026-08-13 08:39:26 +08:00
c-chengc1 4cf4e45ea2 feat:系统UI优化初版 2026-08-07 17:08:19 +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-chengc1 29f305d677 feat:职代会h5端UI优化调整 2026-07-31 17:28:32 +08:00
c-duxc1 e00fdc0c78 web端-新增风采墙模块(工会信息传播与文化展示): 补充所属工会;统计,内容展示等样式调整; 2026-07-31 16:50:17 +08:00
c-zhouhf1 785b9a4b80 commit 2026-07-23 18:30:30 +08:00
c-zhouhf1 2168888ca7 commit 2026-07-14 16:40:42 +08:00
zhouhefeng 7ee1c4fbb5 1 2026-05-28 18:31:36 +08:00
zhouhefeng daac940f3f Merge remote-tracking branch 'origin/main' 2026-05-20 09:04:22 +08:00
zhouhefeng 3f76d2c6cb Changes 2026-05-20 08:54:05 +08:00
= 4bd10c5337 commit 2026-05-06 14:23:54 +08:00
= d7c07aba71 commit 2026-04-30 15:39:07 +08:00
= 466a67e0df Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
# Conflicts:
#	src/main/resources/static/components/module/activity/UserScope.vue
2026-04-30 11:09:23 +08:00
= 896a6fe1ac commit 2026-04-27 17:03:11 +08:00
zhouhefeng 48892370c0 Changes 2026-04-27 08:42:06 +08:00
c-zhouhf1 568dc5e169 commit 2026-04-25 18:20:04 +08:00
c-zhangr1 f454b6d6c3 1 2026-04-25 16:38:47 +08:00
c-zhangr1 473240441f 1 2026-04-23 10:37:18 +08:00
c-zhouhf1 590733bc49 commit 2026-04-03 17:31:51 +08:00
c-zhouhf1 765c715d28 commit 2026-04-03 10:32:14 +08:00
@jyuhsin 6adf949e3e commit 2026-03-31 16:55:35 +08:00
@jyuhsin dc71dc22d8 commit 2026-03-26 14:03:21 +08:00
Paidax c5fbf8576c git查看用户 2026-03-20 15:09:35 +08:00
c-zhouhf1 76c3db3b7f commit 2026-01-29 18:42:50 +08:00
@jyuhsin 6a07605b39 commit 2026-01-22 17:32:06 +08:00
@jyuhsin c50bcbf869 commit 2026-01-22 13:53:50 +08:00
c-zhouhf1 7eac8b00b5 commit 2026-01-21 10:44:02 +08:00
@jyuhsin 483719caa1 commit 2026-01-15 15:44:26 +08:00
@jyuhsin 105c955abd first commit 2026-01-14 14:49:41 +08:00