sy
|
baf1da3edd
|
Merge remote-tracking branch 'remotes/origin/release/2.9.3.2308.01' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java
# src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
# src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
# src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java
# src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
# src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java
# src/com/engine/salary/enums/SalaryValueTypeEnum.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
|
2023-08-14 10:01:21 +08:00 |
|
sy
|
8b1b52a6f2
|
薪酬系统-多语言，适配部分中文表述、薪资项目中excel函数多语言
|
2023-08-09 16:20:32 +08:00 |
Harryxzy
|
da18b0f884
|
薪资账套项目页面改造temp
|
2023-07-25 16:46:57 +08:00 |
|
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 |
 钱涛
|
0734b5ce01
|
公式des
|
2023-05-26 15:40:08 +08:00 |
|
钱涛
|
39ee8d9d35
|
人员明细列表展示账套和核算记录信息、自定义列功能
|
2023-05-26 14:45:04 +08:00 |
|
钱涛
|
3e8ac01049
|
公式描述
|
2023-05-04 18:07:35 +08:00 |
|
钱涛
|
f47ad2a7a3
|
注释接口
|
2023-04-25 18:04:05 +08:00 |
|
sy
|
6d675150e4
|
薪酬系统-多语言配置，controller层添加上下文中的登陆人信息
|
2023-04-23 10:51:01 +08:00 |
|
钱涛
|
890ff64215
|
mock接口
|
2023-03-06 19:45:48 +08:00 |
|
钱涛
|
4d677b4d58
|
mock公式运行
|
2022-12-13 16:13:45 +08:00 |
|
钱涛
|
c3cb3105fd
|
暂存
|
2022-12-13 10:53:43 +08:00 |
|
钱涛
|
cdb7f3a0a2
|
sql测试
|
2022-12-07 15:47:35 +08:00 |
|
钱涛
|
99c0806b73
|
支持外部数据源
|
2022-08-03 10:47:26 +08:00 |
|
钱涛
|
c4831a1612
|
支持外部数据源
|
2022-08-03 10:08:43 +08:00 |
|
钱涛
|
6a024cb35b
|
权限构造
|
2022-04-25 18:06:09 +08:00 |
|
钱涛
|
50d502632f
|
公式
|
2022-04-16 16:49:22 +08:00 |
|
钱涛
|
4db39902b5
|
公式v2
|
2022-04-14 20:46:17 +08:00 |