c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
366 Commits 1 Branch 0 Tags
ca7771e7323367651d85ce6478f14d499ba27cb6
Commit Graph
291 Commits
Author SHA1 Message Date
@jyuhsin ca7771e732 commit 2025-10-31 17:49:37 +08:00
@jyuhsin fc5d6c21b7 Merge remote-tracking branch 'origin/main' 2025-10-31 14:50:39 +08:00
@jyuhsin 96931a0056 commit 2025-10-31 14:50:18 +08:00
c-zhouhf1 4dff54c1dd commit 2025-10-31 11:16:32 +08:00
c-zhouhf1 cdd58734fd commit 2025-10-31 11:14:34 +08:00
c-zhouhf1 568617910e Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 
# Conflicts:
#	src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js
 2025-10-31 11:09:16 +08:00
c-zhouhf1 593d76a267 commit 2025-10-31 11:04:51 +08:00
@jyuhsin ef9b9bc03d commit 2025-10-30 17:38:59 +08:00
= a5bdf21346 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-30 11:42:53 +08:00
= 3bb7bf14e0 bug整改，单身联谊 2025-10-30 11:42:28 +08:00
Paidax 9bf2c1cae5 251023南昌大学交流文档整改 2025-10-30 11:40:25 +08:00
c-zhouhf1 291f307f04 commit 2025-10-29 16:24:34 +08:00
c-zhouhf1 c247c9a4d1 commit 2025-10-29 15:50:03 +08:00
@jyuhsin a6707d516d Merge remote-tracking branch 'origin/main' 2025-10-29 10:48:46 +08:00
@jyuhsin 6e47110458 commit 2025-10-29 10:47:50 +08:00
c-zhouhf1 260e4c25ad commit 2025-10-29 09:14:00 +08:00
= a3fd6a1c26 工会干部培训、健身卡、省级互助保障 2025-10-28 15:28:19 +08:00
= 712b1ea597 工会干部培训 2025-10-27 16:28:42 +08:00
@jyuhsin 5f8de5e32b commit 2025-10-24 17:18:32 +08:00
Paidax b4db19e6b1 commit 2025-10-21 14:27:00 +08:00
Paidax 0209e4931d commit 2025-10-20 14:17:30 +08:00
那些花儿 b3f2a632ef Merge remote-tracking branch 'origin/main' 2025-10-19 20:50:10 +08:00
那些花儿 dc69b0d51b .. 2025-10-19 20:49:37 +08:00
Paidax ff62d8a696 commit 2025-10-19 20:03:35 +08:00
c-zhouhf1 c8f8280e32 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-19 20:00:43 +08:00
c-zhouhf1 7c14e477b1 commit 2025-10-19 20:00:35 +08:00
= 78c80c298b Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-19 19:49:04 +08:00
= 96bbfe1706 修改 2025-10-19 19:48:54 +08:00
那些花儿 663c840968 .. 2025-10-19 19:18:04 +08:00
那些花儿 4269459d70 .. 2025-10-19 19:17:30 +08:00
c-zhouhf1 4afee184cf Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 
# Conflicts:
#	src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java
#	src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
#	src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html
#	src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html
 2025-10-19 18:55:16 +08:00
c-zhouhf1 1cc6e62f07 commit 2025-10-19 18:51:28 +08:00
c-zhouhf1 71860af928 commit 2025-10-19 18:46:49 +08:00
= 2e4c9261c7 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-19 18:46:32 +08:00
= 7ff317afb6 查询修改 2025-10-19 18:46:18 +08:00
@jyuhsin eebded3e1b commit 2025-10-19 18:34:44 +08:00
@jyuhsin a158529a26 commit 2025-10-19 18:29:28 +08:00
@jyuhsin 7a532f5ff3 commit 2025-10-19 17:21:37 +08:00
c-zhouhf1 908c8d4d76 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-19 17:18:40 +08:00
c-zhouhf1 d36cbacf66 commit 2025-10-19 17:18:21 +08:00
c-zhouhf1 be764149e4 commit 2025-10-19 17:18:13 +08:00
@jyuhsin b6d7127ec7 Merge remote-tracking branch 'origin/main' 2025-10-19 16:55:40 +08:00
@jyuhsin 0effb78ef1 commit 2025-10-19 16:50:48 +08:00
Paidax 94c153c101 bug_commit 2025-10-19 16:48:00 +08:00
= 7f0843ed5a 查询修改 2025-10-19 14:26:25 +08:00
c-zhouhf1 c9e825ecb9 commit 2025-10-19 13:43:18 +08:00
@jyuhsin 95133e6aca commit 2025-10-19 11:27:31 +08:00
Paidax ca2e204395 commit 2025-10-17 15:49:02 +08:00
@jyuhsin 1cb3ee9d58 commit 2025-10-17 15:23:10 +08:00
那些花儿 a5f278375a .. 2025-10-17 15:21:01 +08:00