weaver-hrm-salary/src/com/engine/salary/web
Harryxzy 0e2a6c8368 Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01
# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/entity/vo/AppSettingVO.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
2023-07-10 11:10:10 +08:00
..
AddUpDeductionController.java 修复累计专项附加扣除导出全部bug 2023-04-06 16:20:58 +08:00
AddUpSituationController.java 注释 2023-03-15 11:04:54 +08:00
AttendQuoteController.java 数据采集-编辑前查看功能 2022-10-31 14:50:54 +08:00
OtherDeductionController.java feat: 其他附加扣除沿用上月功能完成 2022-11-17 14:28:10 +08:00
ProcessController.java 1、核算、合并计税使用税款所属期作为依据 2022-09-13 16:03:55 +08:00
SIAccountController.java 薪酬系统-福利台账,线下对比(列表、导入、导出)福利项字段根据正常缴纳中的核算字段获得 2023-04-18 14:21:05 +08:00
SIArchivesController.java 删除薪资档案 2023-06-29 10:35:55 +08:00
SICategoryController.java 社保福利方案自定义福利列表改造 2023-03-02 10:46:53 +08:00
SIExportController.java 薪酬系统-福利台账,补差数据导出功能 2022-12-08 14:51:23 +08:00
SIReportController.java fix: 我的调薪记录问题修改,设置分页默认值 2022-10-31 16:37:39 +08:00
SISchemeController.java 薪酬系统-福利档案,导出excel文件名添加日期信息 2023-01-30 09:31:31 +08:00
SalaryAcctController.java 薪酬系统-薪资核算,高级搜索和导出带入筛选条件未生效问题修复 2023-07-07 10:15:23 +08:00
SalaryArchiveController.java 删除薪资档案 2023-06-29 10:35:55 +08:00
SalaryBillController.java Merge branch 'feature/短信验证码' into release/2.8.4.2306.02 2023-06-26 13:54:56 +08:00
SalaryCommonController.java 修复同步档案bug 2023-06-15 10:44:31 +08:00
SalaryFieldController.java 薪资档案薪资项目排序 2023-05-31 09:55:24 +08:00
SalaryFormulaController.java 公式des 2023-05-26 15:40:08 +08:00
SalaryItemController.java 系统薪资项目列表显示改造 2023-06-08 11:10:40 +08:00
SalaryProgressController.java 公共进度条功能 2023-06-06 10:30:49 +08:00
SalarySendRangeController.java feat: 路径修改接近e10 2022-11-29 14:36:37 +08:00
SalarySobController.java 薪资项目 和 字段管理的排序 2023-06-01 17:52:31 +08:00
SalarySystemConfigController.java Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01 2023-07-10 11:10:10 +08:00
SpecialAddDeductionController.java feat: 专项附加扣除模块, 权限限制,导入导出优化,添加一键累计 2022-11-09 10:40:48 +08:00
TaxAgentController.java 下载模板改为get请求 2023-01-09 10:30:26 +08:00
TaxDeclarationController.java 撤回个税申报 2023-06-12 10:40:01 +08:00
TaxRateController.java 暂存 2022-05-24 09:14:26 +08:00