Commit Graph

2252 Commits

Author SHA1 Message Date
lys 5c30538bb8 custom-艾志工业-合并个税 2025-06-20 14:42:35 +08:00
lys a5d1b37100 feature/2.19.1.2501.01-考勤数据编辑 2025-06-13 10:03:02 +08:00
lys 657f55e39d custom-艾志工业-合并个税 2025-06-12 14:57:46 +08:00
lys fc43513970 Merge branch 'release/2.19.1.2501.01-个税' into custom-艾志工业-合并个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
2025-06-12 14:30:32 +08:00
lys 45056afe54 Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税 2025-06-04 13:47:43 +08:00
lys 2b639ad388 custom/五院杭州中心 2025-05-27 12:31:43 +08:00
lys 41695c93af Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税 2025-05-21 13:43:07 +08:00
lys 3be80d9ab2 custom-艾志工业-合并个税 2025-05-20 16:45:53 +08:00
lys 07c40750da release/2.19.1.2501.01 2025-05-19 16:04:11 +08:00
lys a4c08b937b release/2.19.1.2501.01 2025-05-13 13:53:35 +08:00
lys a558c30fc8 Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税 2025-05-13 10:00:46 +08:00
lys 9e26192aa2 release/2.19.1.2501.01 2025-05-09 19:14:38 +08:00
lys d540698c57 release/2.19.1.2501.01 2025-04-30 10:23:36 +08:00
lys e539f7b040 release/2.19.1.2501.01 2025-04-25 09:51:19 +08:00
lys e9d301927f release/2.19.1.2501.01 2025-04-24 16:50:18 +08:00
lys dee1059ca7 release/2.19.1.2501.01 2025-04-24 16:38:36 +08:00
lys 4d8351d627 Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
2025-04-23 18:03:38 +08:00
lys 9a50947d8a release/2.19.1.2501.01 2025-04-23 17:34:46 +08:00
lys 9016fa3fe9 release/2.19.1.2501.01 2025-04-23 16:45:02 +08:00
lys d652b2cdc6 release/2.19.1.2501.01 2025-04-23 16:13:49 +08:00
lys c1269e7dd3 custom-艾志工业-合并个税 2025-04-22 16:10:58 +08:00
lys 2b32f348ba custom-艾志工业-合并个税 2025-04-22 10:53:03 +08:00
lys 51ac08d6fc release/2.19.1.2501.01 2025-04-22 09:35:04 +08:00
lys ae43a2aa7c release/2.19.1.2501.01 2025-04-18 16:21:49 +08:00
lys 82ffd93fd5 5release/2.19.1.2501.01 2025-04-18 15:10:05 +08:00
lys 34b2052926 feature/2.19.1.2501.01-PC端Token验证 2025-04-18 14:49:19 +08:00
lys d5bd7ae264 Merge branch 'release/2.19.1.2501.01' into feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 18:02:22 +08:00
lys 554cf4b6b3 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 17:44:30 +08:00
lys 6b3e321846 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 17:18:36 +08:00
lys b01d280644 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 17:12:53 +08:00
lys 5ab71a3492 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 15:56:32 +08:00
lys b3fff361ec feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 15:23:58 +08:00
lys aaf00ace3c feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 15:13:40 +08:00
lys 94c9a39f9f feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 14:23:31 +08:00
lys fab27c99ed feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 09:54:03 +08:00
lys 55ccd83916 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-16 16:22:51 +08:00
lys 854a49b018 release/2.19.1.2501.01 2025-04-16 15:51:28 +08:00
lys 51d9c58888 release/2.19.1.2501.01 2025-04-15 16:27:19 +08:00
lys 6dfb4e6650 release/2.19.1.2501.01 2025-04-15 16:13:15 +08:00
lys 38572729fd release/3.0.1.2504.01-合并业务线 2025-04-15 15:16:29 +08:00
lys 80307c7b91 release/2.19.1.2501.01 2025-04-14 16:38:41 +08:00
lys f4726da0fc Merge branch 'release/2.19.1.2501.01-个税' into custom-艾志工业-合并个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
#	pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
2025-04-11 14:03:28 +08:00
lys d00b379454 custom-艾志工业-合并个税 2025-04-10 18:21:14 +08:00
lys d882b75dad custom-艾志工业-合并个税 2025-04-10 18:04:35 +08:00
lys 3027491872 custom/领悦业务线 2025-04-10 13:37:38 +08:00
lys 867a0dc58c Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税 2025-04-01 15:07:05 +08:00
lys 3b2a987778 release/2.19.1.2501.01 2025-04-01 15:05:59 +08:00
lys 925bc0f75a release/2.19.1.2501.01 2025-04-01 15:05:39 +08:00
lys cfe8117bbf release/2.19.1.2501.01-个税 2025-04-01 11:28:41 +08:00
lys 41a6afdb40 release/2.19.1.2501.01-个税 2025-03-31 16:11:37 +08:00