Commit Graph

7 Commits

Author SHA1 Message Date
黎永顺 6e832fe873 Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/index.js
#	pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
#	pc4mobx/hrmSalary/pages/declare/generateModal.js
#	pc4mobx/hrmSalary/pages/declare/index.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
#	pc4mobx/hrmSalary/pages/mySalary/index.js
#	pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
#	pc4mobx/hrmSalary/pages/payroll/index.js
#	pc4mobx/hrmSalary/pages/payrollFiles/index.js
#	pc4mobx/hrmSalary/pages/reportView/index.js
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
#	pc4mobx/hrmSalary/pages/salaryItem/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
#	pc4mobx/hrmSalary/pages/taxAgent/index.js
2023-07-04 10:50:53 +08:00
黎永顺 a623679975 产品-数据采集页面编辑框换成数字输入框 2023-07-03 17:29:53 +08:00
黎永顺 0c9051917b 产品-系统多语言 2023-06-08 18:13:37 +08:00
黎永顺 fbc842724d 产品-多语言开发 2023-06-07 15:27:24 +08:00
黎永顺 a9309d9005 产品-系统多语言· 2023-04-18 16:08:54 +08:00
黎永顺 52121e2713 3 2022-11-25 11:47:29 +08:00
18652063575 ca04e5405d 专项附加扣除接口联调 2022-11-04 11:33:58 +08:00