Commit Graph
131 Commits
Author SHA1 Message Date
@jyuhsin 6dab151b79 commit 2026-01-30 13:42:01 +08:00
@jyuhsin 54affda864 commit 2025-12-02 15:37:57 +08:00
@jyuhsin ae86803b17 commit 2025-11-07 11:56:13 +08:00
Paidax 6efa654957 首页 2025-11-06 15:33:35 +08:00
= f290949019 女职工卫生费75% 2025-11-03 08:52:46 +08:00
@jyuhsin ca7771e732 commit 2025-10-31 17:49:37 +08:00
@jyuhsin ef9b9bc03d commit 2025-10-30 17:38:59 +08:00
= 3bb7bf14e0 bug整改,单身联谊 2025-10-30 11:42:28 +08:00
c-zhouhf1 c247c9a4d1 commit 2025-10-29 15:50:03 +08:00
c-zhouhf1 260e4c25ad commit 2025-10-29 09:14:00 +08:00
@jyuhsin 5f8de5e32b commit 2025-10-24 17:18:32 +08:00
Paidax 0209e4931d commit 2025-10-20 14:17:30 +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
那些花儿 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 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 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 be764149e4 commit 2025-10-19 17:18:13 +08:00
Paidax 94c153c101 bug_commit 2025-10-19 16:48:00 +08:00
c-zhouhf1 257b7588a7 commit 2025-10-17 11:07:33 +08:00
@jyuhsin 86ee1c4d64 commit 2025-10-16 20:32:25 +08:00
那些花儿 fbcee4d894 .. 2025-10-16 18:25:14 +08:00
@jyuhsin 45ee9b7285 commit 2025-10-16 16:55:32 +08:00
@jyuhsin 6f3e1ae47c commit 2025-10-16 10:47:25 +08:00
c-zhouhf1 e19c316f78 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-16 09:30:03 +08:00
c-zhouhf1 1f99486914 commit 2025-10-16 09:29:49 +08:00
@jyuhsin 0b7fea7a41 commit 2025-10-15 15:18:53 +08:00
= dc55b0701d bug修改 2025-10-10 08:59:32 +08:00
= 02d2323834 bug修改 2025-09-30 16:02:12 +08:00
Paidax 9da91e75eb commit 2025-09-30 15:16:03 +08:00
= aa516ab4e7 独生子女父母退休bug修改 2025-09-30 13:46:57 +08:00
@jyuhsin f15fb1fab9 Merge remote-tracking branch 'origin/main' 2025-09-29 17:36:28 +08:00
@jyuhsin cb5f9d1119 commit 2025-09-29 17:36:16 +08:00
= 85501dfc49 省级互助保障修改 2025-09-29 16:31:11 +08:00
@jyuhsin aeb8e2b4d2 commit 2025-09-28 10:25:27 +08:00
@jyuhsin f8826a1542 commit 2025-09-26 08:54:44 +08:00
@jyuhsin f2f61d351a commit 2025-09-25 21:58:03 +08:00
@jyuhsin 82b8d4a125 Merge remote-tracking branch 'origin/main' 2025-09-25 21:34:42 +08:00
@jyuhsin a61e800017 commit 2025-09-25 21:34:09 +08:00
c-zhouhf1 2810427b17 commit 2025-09-25 21:29:22 +08:00
@jyuhsin 8490f7d965 commit 2025-09-25 19:12:08 +08:00
= 978b6b856c 1 2025-09-25 18:57:52 +08:00
= dc72dab666 省级互助保障 2025-09-25 16:24:59 +08:00
Paidax 4ef59d727a commit 2025-09-25 14:32:23 +08:00
那些花儿 271b5837c8 .. 2025-09-25 13:42:37 +08:00
@jyuhsin 6243a033eb commit 2025-09-23 17:30:54 +08:00