Commit Graph
207 Commits
Author SHA1 Message Date
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-zhouhf1 fac819eb00 整改提案查看样式 2026-08-20 17:48:53 +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-zhouhf1 db33fd0bbd commit 2026-08-19 17:59:41 +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-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
c-duxc1 d90f87e453 Revert "新增活动电子档案模块;"
This reverts commit b2aef12c84.
2026-07-28 17:42:23 +08:00
c-duxc1 b2aef12c84 新增活动电子档案模块; 2026-07-28 16:55:02 +08:00
c-duxc1 a8a4052c45 新增活动电子档案模块; 2026-07-28 15:59:45 +08:00
c-zhouhf1 785b9a4b80 commit 2026-07-23 18:30:30 +08:00
c-zhouhf1 86ab0142da Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-07-22 13:55:54 +08:00
c-zhouhf1 6b4a3c0525 commit 2026-07-22 13:52:20 +08:00
c-zhangr1 f81544e67f change 2026-07-17 10:56:54 +08:00
c-zhangr1 0936d61450 Merge remote-tracking branch 'origin/main' 2026-07-16 15:01:56 +08:00
c-zhangr1 65831a02dd change 2026-07-16 14:59:53 +08:00
zhouhefeng 730b0efebb Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
 Conflicts:
	src/main/java/com/budwk/app/zhgh/democratic/teachercongress/institution/controller/TeacherCongressInstitutionController.java
	src/main/resources/views/platform/zhgh/democratic/teachercongress/institution/basicTable.js
	src/main/resources/views/platform/zhgh/democratic/teachercongress/institution/index.html
2026-07-15 11:49:49 +08:00
zhouhefeng 3425888c91 commit 2026-07-15 11:47:47 +08:00
= 73954cf4e7 commit 2026-07-15 11:13:08 +08:00
= 5c46d07f46 Merge remote-tracking branch 'origin/main' 2026-07-15 09:24:24 +08:00
= b974d84086 commit 2026-07-15 09:23:00 +08:00
c-zhouhf1 fb25ad45a8 commit 2026-07-14 18:05:53 +08:00
c-zhangr1 cbc0dcf67d change普惠疗休养 2026-07-14 17:41:39 +08:00
c-zhouhf1 33a9a3df05 Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-07-14 16:41:16 +08:00
c-zhouhf1 2168888ca7 commit 2026-07-14 16:40:42 +08:00
= 2f8158a658 Merge remote-tracking branch 'origin/main' 2026-07-14 16:36:44 +08:00
c-zhangr1 71558c3df8 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitRead/index.html
2026-07-14 16:31:37 +08:00
c-zhangr1 68d8045179 1 2026-07-14 16:30:12 +08:00
= 5626139605 commit 2026-07-14 16:29:59 +08:00
c-zhouhf1 33687bbd66 Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-07-14 16:28:31 +08:00
c-zhouhf1 f39735f1f2 commit 2026-07-14 16:28:22 +08:00
c-zhangr1 924feefdeb Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/resources/db/menu/init_tour_menu.sql
#	src/main/resources/db/tour_setting_create.sql
#	src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
#	src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
#	src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js
2026-07-14 16:27:39 +08:00
c-zhangr1 c7503cd4cc 1 2026-07-14 16:24:26 +08:00
= c504830db3 commit 2026-07-14 16:20:40 +08:00
c-zhangr1 fe250baef8 1 2026-07-14 14:35:17 +08:00