Commit Graph

8 Commits

Author SHA1 Message Date
dxfeng c35b323736 5、薪资账套中编辑账套增加所属城市;薪资核算页面中增加所属城市且可以通过所有城市进行筛选 2025-12-31 11:05:15 +08:00
钱涛 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
钱涛 5ccee97429 新建账套携带各扣缴义务人人员范围 2024-09-04 13:59:00 +08:00
钱涛 c72fa7fd7c 保存账套联系 2024-09-02 14:13:29 +08:00
钱涛 cf22685fca 账套-个税字段对应、累计字段对应 2023-08-15 20:48:09 +08:00
钱涛 b5d6adfbde 暂存 2022-05-26 18:16:48 +08:00
钱涛 c01e63040c 薪资项目&账套 2022-03-22 21:01:38 +08:00
钱涛 00bf811075 考勤导出接口 2022-03-16 14:29:02 +08:00