Commit Graph

13 Commits

Author SHA1 Message Date
sy c24572d911 薪酬系统-国际化,转义调用使用带有language字段的方法,并处理相关逻辑 2023-06-21 14:51:41 +08:00
sy eb7014663e Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18
# Conflicts:
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
2023-05-06 17:00:00 +08:00
sy 49c499e7d6 薪酬系统-多语言配置,适配部分中文字符串0425 2023-04-25 18:03:11 +08:00
sy 62af02522c 薪酬系统-福利台账,线下对比(列表、导入、导出)福利项字段根据正常缴纳中的核算字段获得 2023-04-18 14:21:05 +08:00
sy b6ee197fe6 薪酬系统,梳理Mapper类使用方式 2023-03-07 14:21:01 +08:00
fcli d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
sy 755aff52ba 薪酬系统-福利台账,修复线下对比列表排序问题 2022-10-21 14:15:03 +08:00
sy 21a4159ffa 薪酬系统-福利档案改造,福利台账补缴页列表、导入模板带出数据和导出功能添加runStatus约束 2022-10-20 17:33:29 +08:00
sy 2a7c6cac42 薪酬系统-福利档案改造,福利台账线下对比列表仅展示处于在缴人员的数据 2022-10-20 16:08:48 +08:00
sy 2725fc8444 薪酬系统-福利台账,线下对比导入取消表id自增,修改对比数据查询参数格式 2022-09-30 10:55:46 +08:00
sy 1e476e06a5 薪酬系统-福利台账,线下对比结果列表导出v1 2022-09-29 17:32:04 +08:00
sy a44a48450b 薪酬系统-福利台账,线下对比结果列表开发优化v1 2022-09-29 15:11:13 +08:00
sy cec887a214 薪酬系统-福利台账,线下对比结果列表开发 2022-09-29 11:13:49 +08:00