Commit Graph
205 Commits
Author SHA1 Message Date
Paidax 45888897b4 commit 2025-09-24 17:44:32 +08:00
Paidax e6cf2df937 commit 2025-09-24 09:49:52 +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
那些花儿 b3d641d1f2 .. 2025-09-23 16:18:41 +08:00
= 033ceba110 生育休假申请修改,新增工会干部培训 2025-09-23 16:00:16 +08:00
Paidax c3db9628fd commit 2025-09-23 13:50:57 +08:00
那些花儿 4013fd72e6 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-23 11:33:03 +08:00
那些花儿 f8b1aa6398 .. 2025-09-23 11:32:48 +08:00
c-zhouhf1 88662caa57 commit 2025-09-23 11:16:17 +08:00
@jyuhsin 3f6f6ca50e commit 2025-09-23 11:02:08 +08:00
@jyuhsin 0d74bc5e09 Merge remote-tracking branch 'origin/main' 2025-09-23 10:44:13 +08:00
@jyuhsin c3108c879f commit 2025-09-23 10:43:59 +08:00
c-zhouhf1 dad96dbf17 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-23 10:33:06 +08:00
c-zhouhf1 2ecb9c82bd commit 2025-09-23 10:33:01 +08:00
c-zhouhf1 a09f7fac9f commit 2025-09-23 10:32:40 +08:00
Paidax 88eb3dcaab commit 2025-09-23 10:14:43 +08:00
Paidax 5bb6133ae0 commit 2025-09-23 10:02:02 +08:00
Paidax 0ab932e213 commit 2025-09-23 09:53:41 +08:00
c-zhouhf1 af146d6c9b Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-22 20:30:34 +08:00
c-zhouhf1 5977905f1e commit 2025-09-22 20:30:22 +08:00
@jyuhsin ed1ea313cf commit 2025-09-22 20:13:21 +08:00
@jyuhsin 89ae14c8a3 Merge remote-tracking branch 'origin/main' 2025-09-22 17:32:33 +08:00
@jyuhsin 78d82137e4 commit 2025-09-22 17:32:19 +08:00
Paidax e6c880d57f commit 2025-09-22 10:07:49 +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
那些花儿 2ab1cc4114 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4
# Conflicts:
#	src/main/resources/views/platform/zhghh5/sys/home/todo.js
2025-09-18 17:14:01 +08:00
那些花儿 9790e4011e .. 2025-09-18 17:13:35 +08:00
那些花儿 6a24142c19 .. 2025-09-18 17:11:01 +08:00
那些花儿 3babca1af2 .. 2025-09-18 17:09:55 +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
那些花儿 241d207034 .. 2025-09-18 15:57:10 +08:00
@jyuhsin d638f2baf9 commit 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
= 3783f34ce6 独生子女父母退休 2025-09-17 17:43:59 +08:00
@jyuhsin 875922174c commit 2025-09-17 16:10:25 +08:00