Commit Graph
38 Commits
Author SHA1 Message Date
Paidax e6cf2df937 commit 2025-09-24 09:49:52 +08:00
= 033ceba110 生育休假申请修改,新增工会干部培训 2025-09-23 16:00:16 +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
@jyuhsin 3d7f8c3a75 commit 2025-09-18 16:09:24 +08:00
@jyuhsin d638f2baf9 commit 2025-09-18 15:57:10 +08:00
@jyuhsin b05de4830c commit 2025-09-18 10:01:59 +08:00
= 3783f34ce6 独生子女父母退休 2025-09-17 17:43:59 +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
= 9befc77e89 生育休假 2025-09-16 19:56:51 +08:00
那些花儿 52715e3e9a .. 2025-09-12 15:58:49 +08:00
那些花儿 16f2dda958 .. 2025-09-12 11:45:24 +08:00
@jyuhsin 56b7d3628c commit 2025-09-10 14:34:15 +08:00
c-zhouhf1 2a1d1e11ed commit 2025-09-09 20:25:19 +08:00
Paidax 7e9ec112f1 commit 2025-09-09 18:59:36 +08:00
@jyuhsin bee7b352a6 commit 2025-09-09 11:19:04 +08:00
c-zhouhf1 3b87c4ec34 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4
# Conflicts:
#	src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/activityList/basicForm.js
2025-09-04 09:46:18 +08:00
c-zhouhf1 53e6c4bc52 commit 2025-09-04 09:40:50 +08:00
= b827811367 bug修改 2025-09-03 08:44:51 +08:00
Paidax 1531aea1d6 commit 2025-09-02 08:46:56 +08:00
@jyuhsin 06a8e2fda4 commit 2025-08-29 17:52:16 +08:00
@jyuhsin 48cc8a448c commit 2025-08-28 14:51:47 +08:00
c-zhouhf1 c93cf2f36c commit 2025-08-28 11:29:30 +08:00
c-zhouhf1 f364119414 commit 2025-08-28 11:29:13 +08:00
@jyuhsin 3dcf833e7a commit 2025-08-27 17:21:42 +08:00
@jyuhsin 3171c30d43 commit 2025-08-27 13:57:46 +08:00
@jyuhsin dde0dc9610 commit 2025-08-25 10:26:01 +08:00
@jyuhsin fcd57ead6c commit 2025-08-22 10:02:51 +08:00
@jyuhsin f1e071a9bd commit 2025-08-21 09:31:25 +08:00
@jyuhsin b34a1945fc commit 2025-08-20 08:42:54 +08:00
Paidax ad3be9603b commit 2025-08-01 17:44:35 +08:00
@jyuhsin f6b6f95548 Merge remote-tracking branch 'origin/main' 2025-07-31 17:40:42 +08:00
@jyuhsin c3e2365f39 commit 2025-07-31 17:40:26 +08:00
Paidax 1510e28ab0 commit 2025-07-31 15:48:46 +08:00
@jyuhsin 15987f79d5 commit 2025-07-30 15:34:33 +08:00
@jyuhsin 72546696fa commit 2025-07-28 13:40:05 +08:00