 钱涛
|
f3577d3ddd
|
Merge branch 'feature/数据推送' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
# src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/service/OtherDeductionService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalarySobWrapper.java
|
2025-02-12 14:00:43 +08:00 |
|
钱涛
|
3721867723
|
核算和账套的权限
|
2024-08-28 17:55:42 +08:00 |
|
钱涛
|
9b96d0cff2
|
限制账套
|
2024-08-28 10:02:39 +08:00 |
|
钱涛
|
4dcb3b4fea
|
薪资档案分权
|
2024-08-05 15:40:34 +08:00 |
|
钱涛
|
6a8c2dd8ac
|
个税字段配置
|
2024-06-07 11:01:57 +08:00 |
|
钱涛
|
79cfa0cbc0
|
删除往期累计多余项目
往期累计别名设置
|
2024-05-21 10:50:17 +08:00 |
|
钱涛
|
4b823ccca7
|
国际化注解
|
2024-03-11 16:50:47 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
 Chengliang
|
9dc29b2b3c
|
修复xml文件报错
|
2022-04-22 16:42:06 +08:00 |
MustangDeng
|
775b39074d
|
工资单发放-工资单发放信息列表
|
2022-04-14 16:11:44 +08:00 |
|
钱涛
|
a069447f02
|
核算基础公式
|
2022-04-11 20:17:47 +08:00 |
|
钱涛
|
692a57ae63
|
累计bug
|
2022-03-11 15:47:08 +08:00 |
|
钱涛
|
98c49db986
|
其他扣除项接口
|
2022-03-10 17:57:46 +08:00 |
|
钱涛
|
382781fa26
|
列表注解
|
2022-03-07 19:27:32 +08:00 |
|
钱涛
|
4a081d6ad9
|
初始化项目结构、demo样例、mybatis使用样例
|
2022-02-25 19:41:22 +08:00 |