Commit Graph

445 Commits

Author SHA1 Message Date
钱涛 4f36f89e53 Merge branch 'develop' into auth 2022-05-20 14:56:25 +08:00
钱涛 d77e8b0de4 累计扣除字段 2022-05-20 14:41:42 +08:00
钱涛 ac934c901c 暂存 2022-05-19 16:56:57 +08:00
钱涛 985af0197d 全量脚本 2022-05-19 16:44:59 +08:00
钱涛 6adc5620e8 Merge remote-tracking branch 'origin/develop' into develop 2022-05-19 16:44:39 +08:00
钱涛 16036d74c5 全量脚本 2022-05-19 16:44:30 +08:00
钱涛 2c03d4bc27 暂存 2022-05-19 16:36:18 +08:00
MustangDeng 6b9200121e 福利台账归档 2022-05-19 16:32:33 +08:00
钱涛 479bc2d39a 出包材料 2022-05-19 14:50:57 +08:00
钱涛 ed0ba7ed6d 暂存 2022-05-19 14:50:01 +08:00
MustangDeng 1f636c28d6 福利台账异动清单 2022-05-19 11:23:25 +08:00
MustangDeng 6024a69e84 福利档案导出 2022-05-19 10:20:23 +08:00
MustangDeng 0909e37741 数据采集高级搜索 2022-05-19 09:45:02 +08:00
MustangDeng 69246485ee 福利导入模板 2022-05-19 09:33:07 +08:00
MustangDeng f8105537c9 福利导入 2022-05-18 18:53:30 +08:00
MustangDeng 14daede3d0 Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 16:37:34 +08:00
MustangDeng fcbc6c7202 福利方案分页创建 2022-05-18 16:37:23 +08:00
钱涛 647d4ae28b Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 16:08:13 +08:00
钱涛 bb66f80906 fix 新增系统薪资项目,模糊搜索 2022-05-18 16:07:51 +08:00
MustangDeng 51e5649dd8 Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 14:36:46 +08:00
MustangDeng 604d3d453e 福利方案判断重复 2022-05-18 14:36:37 +08:00
钱涛 dc1c865a4b 账套项目删除bug 2022-05-18 14:34:06 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +08:00
钱涛 27b04da333 Merge remote-tracking branch 'origin/develop' into develop 2022-05-16 17:04:19 +08:00
钱涛 a4c285dfd4 异常 2022-05-16 17:03:17 +08:00
MustangDeng 4bd082efb0 福利档案导出 2022-05-13 16:29:18 +08:00
钱涛 9540b0a2ce 自增bug 2022-05-13 11:27:25 +08:00
钱涛 022a78b659 Merge remote-tracking branch 'origin/develop' into develop 2022-05-13 11:22:18 +08:00
钱涛 282c0abc22 薪资项目不使用自增 2022-05-13 11:22:10 +08:00
MustangDeng ed9a9012ad Merge remote-tracking branch 'origin/develop' into develop 2022-05-13 10:32:06 +08:00
MustangDeng 0750ea0f51 福利档案列表报错问题 2022-05-13 10:31:51 +08:00
钱涛 e49bc9943f 薪酬核算第一步不使用线程池 2022-05-12 15:41:12 +08:00
钱涛 a2c59d15f4 项目分类bug 2022-05-12 14:36:16 +08:00
钱涛 83cc76ba77 个税扣缴义务人不存在提醒 2022-05-11 11:23:28 +08:00
钱涛 bdf3a422d6 配置文件GBK编码 2022-05-11 09:26:49 +08:00
钱涛 9dc5a396f2 Merge remote-tracking branch 'origin/develop' into develop 2022-05-10 17:27:10 +08:00
钱涛 c440ccd0a6 修复 2022-05-10 17:26:58 +08:00
MustangDeng b3ca582e3a 我的薪资列表调薪记录 2022-05-10 16:17:37 +08:00
MustangDeng c68af43652 Merge remote-tracking branch 'origin/develop' into develop 2022-05-10 10:55:02 +08:00
MustangDeng fbf6baa676 我的薪资列表工资单列表 2022-05-10 10:54:41 +08:00
钱涛 08ff95bf77 Merge remote-tracking branch 'origin/develop' into develop 2022-05-09 17:47:37 +08:00
钱涛 6f3d8e85c0 个税申报bug 2022-05-09 17:47:19 +08:00
MustangDeng db4cbea487 Merge branch '20220505' into develop 2022-05-09 16:40:48 +08:00
MustangDeng 733bd2b034 档案导入模板调整 2022-05-09 16:40:14 +08:00
钱涛 2c432ab1c0 可删除 2022-05-09 16:39:04 +08:00
钱涛 fd856e0750 入职日期 2022-05-09 14:24:40 +08:00
钱涛 bf37add9dd 修复导出异常 2022-05-09 14:11:07 +08:00
MustangDeng c287aca4a8 工资单撤回 2022-05-09 12:28:59 +08:00
MustangDeng 9dd71e5045 工资单撤回 2022-05-09 12:15:13 +08:00
钱涛 d2a37df97f 申报表异常 2022-05-09 11:46:49 +08:00