 黎永顺
|
8bac520ff0
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculateDetail/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/columns.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
# pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
|
2023-07-27 10:43:14 +08:00 |