Commit Graph

9 Commits

Author SHA1 Message Date
黎永顺 d68ec3743b custom/上海港湾多语言 2024-07-09 10:52:09 +08:00
黎永顺 117b068baf feature/V2-dev合并多语言 2023-12-04 16:50:50 +08:00
黎永顺 b9e98f2b41 Merge branch 'release/2.9.42310.01' into feature/V2-dev合并多语言
# Conflicts:
#	pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
#	pc4mobx/hrmSalary/pages/calculateDetail/index.js
#	pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
#	pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
#	pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
#	pc4mobx/hrmSalary/pages/payroll/index.js
#	pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
#	pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
#	pc4mobx/hrmSalary/pages/payrollFiles/index.js
#	pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
#	pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
#	pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
#	pc4mobx/hrmSalary/pages/reportView/index.js
#	pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
#	pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
2023-10-09 18:38:26 +08:00
黎永顺 85867da080 hotfix/2.9.42309.01 2023-09-14 14:19:08 +08:00
黎永顺 f18bda74f4 hotfix/2.9.42309.01 2023-09-14 11:50:22 +08:00
黎永顺 0c9051917b 产品-系统多语言 2023-06-08 18:13:37 +08:00
黎永顺 fbc842724d 产品-多语言开发 2023-06-07 15:27:24 +08:00
黎永顺 d21d987823 产品-系统多语言 2023-05-23 17:03:25 +08:00
黎永顺 a7028943ed 薪资账套页面重构 2022-12-12 14:15:58 +08:00