 黎永顺
|
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 |
|
黎永顺
|
b22b41382f
|
hotfix/2.9.42309.01
20230920-社保福利方案添加搜索条件
|
2023-09-20 16:51:00 +08:00 |
|
黎永顺
|
ecc2021916
|
2.9.42308.02bug修复
|
2023-08-29 14:24:43 +08:00 |
|
黎永顺
|
6b805c6bfc
|
系统多语言-项目改造
|
2023-08-10 15:29:40 +08:00 |
|
黎永顺
|
27e4d2f254
|
产品-系统多语言
|
2023-07-31 15:30:28 +08:00 |
|
黎永顺
|
fc9a4616af
|
产品-多语言
|
2023-07-31 09:01:52 +08:00 |
|
黎永顺
|
b6157dd074
|
产品-多语言
|
2023-07-27 11:34:37 +08:00 |
|
黎永顺
|
d114e3b7bd
|
产品-合并系统多语言
|
2023-06-09 11:38:20 +08:00 |
|
黎永顺
|
0c9051917b
|
产品-系统多语言
|
2023-06-08 18:13:37 +08:00 |
|
黎永顺
|
fbc842724d
|
产品-多语言开发
|
2023-06-07 15:27:24 +08:00 |
|
黎永顺
|
5545b59b3a
|
产品-多语言话
|
2023-04-14 13:29:21 +08:00 |
|
黎永顺
|
7539c60af5
|
社保福利方案表格固定的bug处理
|
2023-02-27 09:16:57 +08:00 |
|
黎永顺
|
d1e0460e39
|
bug修复
|
2023-02-22 10:39:47 +08:00 |
|
黎永顺
|
38ca2cc421
|
社保福利档案页面重构
|
2023-02-13 16:38:15 +08:00 |
|
黎永顺
|
f6f786b33f
|
社保福利档案页面重构
|
2023-02-13 16:00:14 +08:00 |
|
黎永顺
|
b234e78b2f
|
社保福利方案新增字段
|
2023-02-01 17:57:21 +08:00 |
|
黎永顺
|
dcb2f5f864
|
社保福利方案社保编辑报错的bug解决
|
2022-11-10 17:24:56 +08:00 |
18652063575
|
ba11b69e31
|
社保福利档案接口修改
|
2022-11-04 13:51:41 +08:00 |
|
18652063575
|
abd8f2b9f4
|
社保福利档案页面的接口联调
|
2022-11-01 15:50:54 +08:00 |
|
18652063575
|
023f70e692
|
社保福利档案接口对接
|
2022-11-01 10:35:59 +08:00 |
|
18652063575
|
24b24c2652
|
社保福利档案页面添加提示语
|
2022-10-31 14:49:24 +08:00 |
|
18652063575
|
27e54073c6
|
统一所有页面你的弹框以及抽屉头部组件,样式bug的修改
|
2022-09-15 11:08:13 +08:00 |
|
liyongshun
|
ef9f8478a7
|
bug的修正
|
2022-09-01 17:52:00 +08:00 |
|
liyongshun
|
6768649ac4
|
bug的修正
|
2022-08-25 17:54:18 +08:00 |
|
liyongshun
|
a258a2f342
|
bug
|
2022-06-28 18:07:41 +08:00 |
|
liyongshun
|
78adb5cf0d
|
测试bug的修复
|
2022-06-17 16:53:27 +08:00 |
MustangDeng
|
70a5d3ae7b
|
fix bug 48 - 56
|
2022-06-16 20:58:54 +08:00 |
|
MustangDeng
|
4701ada4dc
|
福利方案bug处理
|
2022-05-18 17:10:12 +08:00 |
|
MustangDeng
|
b678ec91e6
|
验证
|
2022-04-06 14:26:16 +08:00 |
|
MustangDeng
|
be4051e5ea
|
programme
|
2022-03-21 17:43:26 +08:00 |