 c-chengc1
|
b5e7a26fdd
|
Merge remote-tracking branch 'origin/feature_重大事项' into release_20260829
|
2026-08-29 08:54:06 +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
|
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-zhangr1
|
7622e414b6
|
change
|
2026-08-20 10:55:26 +08:00 |
|
|
c-zhangr1
|
34fe53caf9
|
change
|
2026-08-20 10:55:04 +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-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 |
|
|
c-duxc1
|
8bff6f8ce9
|
新增web端职代会管理(职代会届次取值teacher_congress_session表数据);
|
2026-07-29 14:57:41 +08:00 |
|
|
c-duxc1
|
a93cbc9704
|
Revert "新增活动电子档案模块;"
This reverts commit a8a4052c45.
|
2026-07-28 17:42:37 +08:00 |
|
|
c-chengc1
|
704bc278fa
|
feat:浦发项目模块迁移-职代会h5端初始化
|
2026-07-28 17:27:29 +08:00 |
|
|
c-duxc1
|
a8a4052c45
|
新增活动电子档案模块;
|
2026-07-28 15:59:45 +08:00 |
|
|
c-chengc1
|
5df36acc22
|
feat:浦发项目模块迁移-重大事项初始化
|
2026-07-28 10:54:28 +08:00 |
|
|
c-zhangr1
|
cbc0dcf67d
|
change普惠疗休养
|
2026-07-14 17:41:39 +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 |
|
|
c-zhangr1
|
93ef06cfe6
|
1
|
2026-07-14 14:34:34 +08:00 |
|
 c-zhouhf1
|
783e2b1fb0
|
commit
|
2026-07-08 15:28:09 +08:00 |
|
 zhouhefeng
|
643c978692
|
Changes
|
2026-06-15 14:36:39 +08:00 |
|
|
zhouhefeng
|
601e1ac039
|
Changes
|
2026-06-15 14:20:03 +08:00 |
|
|
zhouhefeng
|
8b47088953
|
commit
|
2026-06-01 08:36:26 +08:00 |
|
|
zhouhefeng
|
7ee1c4fbb5
|
1
|
2026-05-28 18:31:36 +08:00 |
|
|
zhouhefeng
|
e48f8956a5
|
Changes
|
2026-05-20 09:02:56 +08:00 |
|
|
@jyuhsin
|
105c955abd
|
first commit
|
2026-01-14 14:49:41 +08:00 |
|