Commit Graph

16 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
黎永顺 3d04a79fcd 产品-统一页面列表操作按钮 2023-07-03 15:42:11 +08:00
黎永顺 e06728670b 产品-数据采集页面列表样式修改 2023-06-20 14:25:30 +08:00
黎永顺 0c9051917b 产品-系统多语言 2023-06-08 18:13:37 +08:00
黎永顺 fbc842724d 产品-多语言开发 2023-06-07 15:27:24 +08:00
黎永顺 2194640fce 产品-系统多语言· 2023-04-18 14:00:08 +08:00
黎永顺 9cacf05b6d 薪酬产品-往期累计情况(工资、薪金)添加个人公积金编辑项以及其他模块bug修复 2023-04-04 17:13:58 +08:00
黎永顺 09ee398bfc 优化 2023-03-20 18:00:36 +08:00
黎永顺 172af786ed 221环境测试出的bug修复 2023-02-23 15:59:28 +08:00
黎永顺 a77c800995 数据采集页面重构 2023-02-22 14:00:34 +08:00
黎永顺 a11ad9d7d1 数据采集页面重构 2023-02-21 09:57:44 +08:00
黎永顺 b6849400d7 数据采集页面重构 2023-02-20 14:28:08 +08:00
黎永顺 6cff75a9b5 数据采集页面重构 2023-02-20 13:21:04 +08:00
黎永顺 38f25e5a95 数据采集页面重构 2023-02-20 10:24:40 +08:00
黎永顺 3affb156b9 数据采集页面重构 2023-02-20 09:41:36 +08:00
黎永顺 67b211e656 数据采集页面重构 2023-02-17 17:21:05 +08:00