 c-chengc1
|
3f741ebab6
|
Merge remote-tracking branch 'origin/release_20260831' into release_20260831
|
2026-08-31 15:30:03 +08:00 |
|
 c-zhouhf1
|
2341b136ca
|
品牌活动报名统计增加校工会活动管理员看全部活动
不是超级管理员加不了角色
|
2026-08-31 15:20:00 +08:00 |
|
|
c-chengc1
|
120f0bd046
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-31 13:36:12 +08:00 |
|
 c-chenxs1
|
a21007bada
|
feat: 会议选座样式优化-2
|
2026-08-31 11:54:17 +08:00 |
|
|
c-chengc1
|
5f20d703e4
|
Merge remote-tracking branch 'origin/feature_提案&困难帮扶&作品征集UI优化' into release_20260831
|
2026-08-31 11:14:20 +08:00 |
|
|
c-chengc1
|
f89b0f643d
|
feat:代表证卡套样式优化；消息中心、待办中心样式优化
|
2026-08-30 17:59:02 +08:00 |
|
|
c-zhouhf1
|
58921d9bb2
|
整改提案
整改慰问增加骨架屏
整改作品征集
整改困难帮扶
|
2026-08-30 17:04:37 +08:00 |
|
|
c-chengc1
|
0d944da8b5
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-30 15:53:38 +08:00 |
|
|
c-chenxs1
|
6124e33edb
|
feat: 会议选座、代表阅览2
|
2026-08-30 15:49:13 +08:00 |
|
|
c-chenxs1
|
b0182731bd
|
feat: 会议选座、代表阅览
|
2026-08-30 15:49:07 +08:00 |
|
|
c-chengc1
|
479074d684
|
Merge remote-tracking branch 'origin/feature_会员模块UI优化' into release_20260831
|
2026-08-30 14:41:59 +08:00 |
|
|
c-chengc1
|
81912befab
|
Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831
|
2026-08-30 14:40:14 +08:00 |
|
|
c-chengc1
|
4efbfe40ac
|
Merge remote-tracking branch 'origin/feature_职代会UI优化' into release_20260831
|
2026-08-30 14:39:27 +08:00 |
|
|
c-chengc1
|
6573043dae
|
Merge remote-tracking branch 'origin/feature_社团组织管理UI优化' into release_20260831
|
2026-08-30 14:38:18 +08:00 |
|
|
c-chengc1
|
7ae67a46a5
|
feat:职代会ui优化
|
2026-08-30 14:34:42 +08:00 |
|
 c-zhangr1
|
4db67dfccf
|
移动端人员管理模块UI优化
|
2026-08-30 13:58:47 +08:00 |
|
 =
|
bc8f23a61d
|
手机端社团UI优化
|
2026-08-30 11:11:29 +08:00 |
|
|
c-chenxs1
|
ec54e3fc0d
|
feat: 代表团凭证展示优化
|
2026-08-29 17:40:45 +08:00 |
|
|
c-chenxs1
|
b1cd738a53
|
Merge remote-tracking branch 'refs/remotes/origin/feature_主分支合并UI优化' into feature_教代会代表证
# Conflicts:
# src/main/java/com/budwk/app/sys/controller/SysConfController.java
|
2026-08-29 16:27:12 +08:00 |
|
|
c-chenxs1
|
f2fb656912
|
feat: 代表团凭证
|
2026-08-29 16:23:09 +08:00 |
|
|
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
|
7d2bf71d36
|
Merge remote-tracking branch 'origin/feature_活动电子档案' into release_20260829
|
2026-08-29 09:50:22 +08:00 |
|
 c-duxc1
|
17e8379903
|
活动电子档案代码重发;
|
2026-08-29 09:39:34 +08:00 |
|
|
c-chengc1
|
60c3183d29
|
Merge remote-tracking branch 'refs/remotes/origin/dev-mall' into release_20260829
# Conflicts:
# src/main/java/com/budwk/app/sys/controller/v4/SysV4MsgController.java
# src/main/resources/views/platform/zhghh5/sys/home/msg.js
|
2026-08-29 09:12:07 +08:00 |
|
|
c-chengc1
|
b5e7a26fdd
|
Merge remote-tracking branch 'origin/feature_重大事项' into release_20260829
|
2026-08-29 08:54:06 +08:00 |
|
|
c-chengc1
|
c9f8e852b2
|
Merge remote-tracking branch 'refs/remotes/origin/feature_品牌工作室' into release_20260829
|
2026-08-29 08:52:42 +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-zhouhf1
|
37f874f31d
|
问卷整改
|
2026-08-28 17:00:42 +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
|
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
|
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-zhangr1
|
06893cf3e9
|
change
|
2026-08-21 14:58:15 +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 |
|