Commit Graph

2335 Commits

Author SHA1 Message Date
lys d65245b330 release/2.18.2.2412.02-个税 2024-12-30 17:46:50 +08:00
lys 576a108fa9 release/2.18.2.2412.02 2024-12-30 16:55:47 +08:00
lys 6b5417362a release/2.18.2.2412.02-个税 2024-12-30 13:52:55 +08:00
lys 726890774c release/2.18.2.2412.02-个税 2024-12-30 10:52:11 +08:00
lys 2e466c662f release/2.18.2.2412.02-个税 2024-12-27 15:58:48 +08:00
lys 69004fa1f1 Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2024-12-27 14:11:34 +08:00
lys 33280a603f feature/2.15.2.2411.01业务线 2024-12-27 14:11:20 +08:00
lys f111164783 release/2.18.2.2412.02-个税 2024-12-27 14:09:55 +08:00
lys d6d7b7b545 Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2024-12-27 11:16:18 +08:00
lys c00a678df1 feature/2.15.2.2411.01业务线 2024-12-27 11:16:06 +08:00
lys fd8910e361 Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2024-12-27 11:03:11 +08:00
lys eaded8d937 feature/2.15.2.2411.01业务线 2024-12-27 11:02:58 +08:00
lys 7216560bfd release/2.18.2.2412.02-个税 2024-12-27 11:01:38 +08:00
lys 15c24bf0b7 release/2.18.2.2412.02-个税 2024-12-27 10:02:10 +08:00
lys 64d1b61f15 release/2.18.2.2412.02-个税 2024-12-27 09:51:57 +08:00
lys 6a4f9cd2af Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2024-12-27 09:16:26 +08:00
lys 322e6a9f96 Merge branch 'release/2.18.2.2412.02' into feature/2.15.2.2411.01业务线 2024-12-27 09:16:05 +08:00
lys bafd4e7538 Merge branch 'release/2.18.2.2412.02' into release/2.18.2.2412.02-个税 2024-12-27 09:12:38 +08:00
lys 8aa696fee5 release/2.18.2.2412.02 2024-12-27 09:12:09 +08:00
lys 6e6262e67a release/2.18.2.2412.02-release/2.18.2.2412.02-个税 2024-12-26 18:22:49 +08:00
lys 1d88fd9f35 release/2.18.2.2412.02-release/2.18.2.2412.02-个税 2024-12-26 18:12:37 +08:00
lys fa3d3a283e Merge branch 'release/2.18.2.2412.02' into release/2.18.2.2412.02-个税
# Conflicts:
#	pc4mobx/hrmSalary/components/FormInfo/index.js
2024-12-25 17:25:31 +08:00
lys 8b8f4cd610 release/2.18.2.2412.02 2024-12-25 17:20:55 +08:00
lys e8f820058b release/2.18.2.2412.02-个税 2024-12-25 10:54:45 +08:00
lys 420104e131 release/2.18.2.2412.02-release/2.18.2.2412.02-个税 2024-12-24 18:09:15 +08:00
lys cec22dc89f release/2.18.2.2412.02 2024-12-24 15:41:15 +08:00
lys e0b387503b release/2.18.2.2412.02-个税 2024-12-24 15:36:46 +08:00
lys c04cc1de76 release/2.18.2.2412.02 2024-12-23 15:28:05 +08:00
lys 1ece8f4ff2 release/2.18.1.2412.01-个税 2024-12-20 17:30:39 +08:00
lys 42048aa5a3 release/2.18.1.2412.01-个税 2024-12-20 16:43:00 +08:00
lys 10cad4e462 Merge branch 'release/2.18.1.2412.01' into release/2.18.1.2412.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
2024-12-20 16:40:30 +08:00
lys cdd98ea602 release/2.18.1.2412.01 2024-12-20 16:36:50 +08:00
lys 2574959c54 release/2.18.1.2412.01-个税 2024-12-19 15:45:20 +08:00
lys de0054adb2 Merge branch 'release/2.18.1.2412.01' into feature/2.15.2.2411.01业务线 2024-12-17 16:04:50 +08:00
lys ef1c529941 release/2.18.1.2412.01 2024-12-17 16:03:52 +08:00
lys c7af8335e6 Merge branch 'release/2.18.1.2412.01' into release/2.18.1.2412.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
2024-12-13 13:53:42 +08:00
lys d9844eed9b release/2.18.1.2412.01 2024-12-11 15:28:14 +08:00
lys d2bd5befe7 feature/2.15.2.2411.01业务线 2024-12-10 14:07:12 +08:00
lys 8da06ed9ae Merge branch 'release/2.18.1.2412.01' into feature/2.15.2.2411.01业务线
# Conflicts:
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
2024-12-10 14:06:09 +08:00
lys 02a367befb release/2.18.1.2412.01
薪资核算进度条处理
2024-12-10 09:11:12 +08:00
lys eb66a32612 release/2.18.1.2412.01 2024-12-09 18:14:41 +08:00
lys 89b9e6110e release/2.18.1.2412.01 2024-12-09 18:01:05 +08:00
lys 3871eb276a 1release/2.18.1.2412.01 2024-12-09 17:58:24 +08:00
lys 5f893b1eb0 release/2.18.1.2412.01 2024-12-09 17:37:44 +08:00
lys f2b957578d Merge branch 'release/2.17.1.2411.01' into release/2.17.1.2411.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
2024-12-09 15:28:31 +08:00
lys a46f4869e5 Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
2024-12-09 15:22:49 +08:00
lys b69f30529d Merge branch 'feature/2.17.1.2411.01-薪酬报表薪资明细显示模式' into release/2.17.1.2411.01 2024-12-05 10:51:06 +08:00
lys 5c8f045373 feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-04 17:39:23 +08:00
lys 8a2891f454 release/2.17.1.2411.01 2024-12-04 17:06:29 +08:00
lys 5d817c9594 feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-04 15:42:49 +08:00