Commit Graph

286 Commits

Author SHA1 Message Date
钱涛 036b6fea96 Merge remote-tracking branch 'origin/develop' into develop 2022-04-01 10:26:55 +08:00
钱涛 c03078cb12 Merge branch 'feature/qt' into develop 2022-04-01 10:26:44 +08:00
钱涛 8326f3ae6f 导入参数 2022-04-01 10:26:28 +08:00
MustangDeng 266745c241 Merge branch 'feature/djp' into develop 2022-04-01 09:21:19 +08:00
MustangDeng e5100c8f44 福利方案列表 2022-04-01 09:20:44 +08:00
钱涛 e8de53d51f Merge remote-tracking branch 'origin/develop' into develop 2022-03-31 18:42:23 +08:00
钱涛 e9e03880d9 Merge branch 'feature/qt' into develop 2022-03-31 18:42:06 +08:00
钱涛 163963d463 fix bug 2022-03-31 18:41:41 +08:00
钱涛 a8732708a8 薪资档案导入 2022-03-31 15:41:55 +08:00
MustangDeng 13b69c76eb 档案列表快捷搜索 2022-03-31 14:22:42 +08:00
MustangDeng b10c09f0c4 档案列表列表问题 2022-03-31 13:41:40 +08:00
钱涛 cd6ad5f4be Merge branch 'feature/qt' into develop 2022-03-30 20:27:33 +08:00
钱涛 4167cb55ee 限制薪资项目的删除 2022-03-30 20:27:17 +08:00
钱涛 b30bcb8453 Merge branch 'feature/qt' into develop 2022-03-30 18:32:55 +08:00
钱涛 93686e38c5 bug 2022-03-30 18:32:44 +08:00
钱涛 fbfb5f5005 Merge branch 'feature/qt' into develop 2022-03-30 18:01:07 +08:00
钱涛 922a055f97 统一sql 2022-03-30 18:00:56 +08:00
钱涛 b573118641 Merge branch 'feature/qt' into develop 2022-03-30 15:58:40 +08:00
钱涛 d6ed96e891 sql修改 2022-03-30 15:58:29 +08:00
钱涛 94bef09608 Merge branch 'feature/qt' into develop 2022-03-30 14:56:45 +08:00
钱涛 6d61297dd1 sql修改 2022-03-30 14:56:31 +08:00
钱涛 50a62e3b29 Merge branch 'feature/qt' into develop 2022-03-30 12:16:07 +08:00
钱涛 a3604a28f0 校驗規則列表 2022-03-30 12:15:49 +08:00
钱涛 f8a704e66c 修改sql 2022-03-30 11:29:48 +08:00
钱涛 cf39049530 Merge branch 'feature/qt' into develop 2022-03-29 17:11:15 +08:00
钱涛 5c550365f1 薪资档案 2022-03-29 17:10:59 +08:00
钱涛 2a5a72f6ab Merge branch 'feature/qt' into develop 2022-03-28 20:04:51 +08:00
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 019cdd9968 Merge branch 'feature/qt' into develop 2022-03-28 16:37:03 +08:00
钱涛 5ae4eb5fc8 项目id 2022-03-28 16:36:40 +08:00
钱涛 dc6ebdb4df Merge branch 'feature/qt' into develop 2022-03-28 13:48:55 +08:00
钱涛 93154ada71 薪资账套项目保存 2022-03-28 13:48:43 +08:00
钱涛 faca2d4d1b Merge branch 'feature/qt' into develop 2022-03-28 11:38:46 +08:00
钱涛 045293426c 账套校验规则 2022-03-28 11:38:33 +08:00
钱涛 00c0fe477e 税率 2022-03-28 10:49:23 +08:00
钱涛 c9281bd6db Merge branch 'feature/qt' into develop 2022-03-25 18:05:18 +08:00
钱涛 1db71a97ff 薪资账套 2022-03-25 18:05:07 +08:00
钱涛 cc233e82a5 Merge branch 'feature/qt' into develop 2022-03-25 10:46:05 +08:00
钱涛 24c50f7f17 名称模糊查询 2022-03-25 10:45:53 +08:00
钱涛 cc13dd5c7b Merge branch 'feature/qt' into develop 2022-03-25 10:31:45 +08:00
钱涛 980415c8ca 账套 2022-03-25 10:31:31 +08:00
钱涛 c4142801bc Merge branch 'feature/qt' into develop 2022-03-24 20:01:56 +08:00
钱涛 f2cf03ebbf departmentIds 2022-03-24 20:01:25 +08:00
钱涛 5ad46ffabd Merge branch 'feature/qt' into develop 2022-03-24 19:42:11 +08:00
钱涛 a9d486bef6 相对更新 2022-03-24 19:42:03 +08:00
钱涛 48f1497f96 Merge remote-tracking branch 'origin/develop' into develop 2022-03-24 17:00:19 +08:00
钱涛 466966dac6 Merge branch 'feature/qt' into develop 2022-03-24 17:00:08 +08:00
钱涛 83e1cf2805 相对更新 2022-03-24 16:59:52 +08:00
reset 8df72164cc
!13 福利方案高级搜索接口
Merge pull request !13 from reset/archive
2022-03-23 13:07:37 +00:00
Chengliang d82e3e9e6f 福利方按高级搜索接口 2022-03-23 21:05:01 +08:00