sy
|
b5eeb97d3d
|
Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
# src/com/engine/salary/entity/salaryBill/param/SalarySendWithdrawParam.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
# src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
# src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java
# src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
# src/com/engine/salary/report/enums/UnitTypeEnum.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
# src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/web/SalaryAcctController.java
# src/com/engine/salary/web/SalaryFormulaController.java
# src/com/engine/salary/web/SalaryProgressController.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2023-06-30 11:37:39 +08:00 |
|
sy
|
c24572d911
|
薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑
|
2023-06-21 14:51:41 +08:00 |
Harryxzy
|
0e601e3967
|
修改DBType的写法
|
2023-06-19 13:59:24 +08:00 |
|
sy
|
c8fd57aaad
|
薪酬系统-多语言配置，适配部分中文字符串0426
|
2023-04-26 17:57:53 +08:00 |
|
sy
|
7ec54ea909
|
薪酬系统-多语言配置，适配部分中文字符串0424，调整福利台账线下对比导入相关逻辑
|
2023-04-24 18:22:31 +08:00 |
|
Harryxzy
|
d9f041c9bb
|
账套删除前校验是否存在工资单模板
|
2023-04-07 16:06:47 +08:00 |
|
Harryxzy
|
f89c5d2970
|
工资单模板编辑补发模板
|
2022-12-07 15:03:39 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
 钱涛
|
e0a031e197
|
oracle异常
|
2022-08-18 15:02:04 +08:00 |
|
钱涛
|
dc27578ddf
|
社保福利分权1.0
|
2022-06-06 16:55:02 +08:00 |
MustangDeng
|
78234f7554
|
工资单默认模板
|
2022-05-24 10:24:17 +08:00 |
|
MustangDeng
|
897c98114f
|
工资单发放-工资单模板接口
|
2022-04-12 18:28:12 +08:00 |
|
MustangDeng
|
bd8305763e
|
工资单发放-编译
|
2022-04-12 10:11:53 +08:00 |
|
MustangDeng
|
1573abd1ee
|
Revert "工资单发放-todo"
This reverts commit b850f5ad
|
2022-04-11 14:30:30 +08:00 |
|
MustangDeng
|
b850f5ad8d
|
工资单发放-todo
|
2022-04-11 14:28:45 +08:00 |