Commit Graph
105 Commits
Author SHA1 Message Date
@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
那些花儿 e2e5de203a Merge remote-tracking branch 'origin/main' 2025-09-23 16:18:56 +08:00
= 033ceba110 生育休假申请修改,新增工会干部培训 2025-09-23 16:00:16 +08:00
那些花儿 f8b1aa6398 .. 2025-09-23 11:32:48 +08:00
@jyuhsin 78d82137e4 commit 2025-09-22 17:32:19 +08:00
@jyuhsin ad8b47358a commit 2025-09-20 15:12:47 +08:00
@jyuhsin 705902dfb9 Merge remote-tracking branch 'origin/main' 2025-09-19 17:18:42 +08:00
@jyuhsin 71d471f8c8 commit 2025-09-19 17:18:28 +08:00
= c8c83e5abd 生育休假、独生子女父母退休 2025-09-19 14:08:22 +08:00
= bd96676929 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4
# Conflicts:
#	src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html
2025-09-19 09:39:00 +08:00
= 90f37ef369 生育休假、独生子女父母退休移动端 2025-09-19 09:37:26 +08:00
c-zhouhf1 f88697c30a Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-18 18:49:01 +08:00
c-zhouhf1 5665fcf44a commit 2025-09-18 18:48:55 +08:00
@jyuhsin 769bec658f commit 2025-09-18 17:56:58 +08:00
@jyuhsin 3d7f8c3a75 commit 2025-09-18 16:09:24 +08:00
@jyuhsin cfc4c5210d commit 2025-09-18 16:06:27 +08:00
@jyuhsin e30a1b3315 Merge remote-tracking branch 'origin/main' 2025-09-18 16:00:29 +08:00
@jyuhsin d638f2baf9 commit 2025-09-18 15:57:10 +08:00
那些花儿 241d207034 .. 2025-09-18 15:57:10 +08:00
@jyuhsin b05de4830c commit 2025-09-18 10:01:59 +08:00
= d377676758 Merge remote-tracking branch 'origin/main' 2025-09-18 08:40:17 +08:00
= edfd0eb61d 子女信息bug 2025-09-17 17:56:28 +08:00
那些花儿 b469c09cbc Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-17 17:52:38 +08:00
那些花儿 3f40ee599e .. 2025-09-17 17:52:09 +08:00
Paidax f261b15df6 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-17 10:43:38 +08:00
Paidax b7faf07236 commit 2025-09-17 10:43:22 +08:00
@jyuhsin 838920d68b commit 2025-09-16 20:17:20 +08:00