 =
|
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-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 |
|
|
=
|
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-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 |
|
|
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 |
|
|
c-zhangr1
|
93ef06cfe6
|
1
|
2026-07-14 14:34:34 +08:00 |
|
|
=
|
24e2d9e826
|
commit
|
2026-07-14 09:19:04 +08:00 |
|
|
zhouhefeng
|
9b4f4d57be
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-07-14 09:15:41 +08:00 |
|
|
zhouhefeng
|
cadd4bbffe
|
Changes
|
2026-07-14 09:12:00 +08:00 |
|
|
c-zhouhf1
|
783e2b1fb0
|
commit
|
2026-07-08 15:28:09 +08:00 |
|
|
=
|
635038b25c
|
commit
|
2026-07-07 10:24:37 +08:00 |
|
|
=
|
34627245ac
|
commit
|
2026-07-03 17:25:27 +08:00 |
|
|
c-zhouhf1
|
6380842b34
|
commit
|
2026-07-03 17:10:35 +08:00 |
|
|
=
|
2e3c3e87da
|
commit
|
2026-07-01 09:21:06 +08:00 |
|
|
c-zhouhf1
|
b3f02790fc
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
# Conflicts:
# src/main/resources/application-dev.yaml
|
2026-06-16 10:28:39 +08:00 |
|
|
c-zhouhf1
|
455e4ca117
|
commit
|
2026-06-16 10:28:26 +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
|
873213de53
|
Changes
|
2026-06-15 14:18:01 +08:00 |
|
|
zhouhefeng
|
449428b762
|
commit
|
2026-06-02 08:17:07 +08:00 |
|
|
c-zhouhf1
|
eff5c662d2
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
# Conflicts:
# src/main/java/com/budwk/app/sys/controller/SysConfController.java
# src/main/resources/views/layouts/v4/home/index.html
|
2026-06-01 08:41:59 +08:00 |
|
|
c-zhouhf1
|
79e61f8d99
|
commit
|
2026-06-01 08:41:09 +08:00 |
|
|
zhouhefeng
|
8b47088953
|
commit
|
2026-06-01 08:36:26 +08:00 |
|
|
c-zhouhf1
|
9d7fa18c53
|
commit
|
2026-05-29 09:21:40 +08:00 |
|
|
c-zhouhf1
|
02dde3fe3a
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-05-28 19:52:36 +08:00 |
|
|
c-zhouhf1
|
8915ace193
|
commit
|
2026-05-28 19:52:20 +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
|
e48f8956a5
|
Changes
|
2026-05-20 09:02:56 +08:00 |
|
|
zhouhefeng
|
3f76d2c6cb
|
Changes
|
2026-05-20 08:54:05 +08:00 |
|
|
=
|
5fb4c261c8
|
Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
|
2026-05-09 15:36:56 +08:00 |
|
|
=
|
9e014daddf
|
commit
|
2026-05-09 15:33:13 +08:00 |
|
|
c-zhouhf1
|
4fc3b318ed
|
commit
|
2026-05-09 15:04:03 +08:00 |
|