Commit Graph

146 Commits

Author SHA1 Message Date
钱涛 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
钱涛 288c274aaf Merge branch 'feature/qt' into develop 2022-03-23 20:54:22 +08:00
钱涛 79f9e010af 账套薪资项目 2022-03-23 20:54:08 +08:00
钱涛 00150f1696 Merge branch 'feature/qt' into develop 2022-03-23 18:41:52 +08:00
钱涛 b3d7123401 列表添加id 2022-03-23 18:41:38 +08:00
钱涛 2c65022174 Merge branch 'feature/qt' into develop 2022-03-23 13:52:58 +08:00
钱涛 e66445ce20 人员sql 2022-03-23 13:52:43 +08:00
钱涛 578b8f7aaa Merge remote-tracking branch 'origin/develop' into develop 2022-03-23 09:26:33 +08:00
钱涛 c01e63040c 薪资项目&账套 2022-03-22 21:01:38 +08:00
reset 24a5b0b48d
!12 福利档案接口
Merge pull request !12 from reset/archive
2022-03-22 11:48:54 +00:00
Chengliang 56036bf9cb 福利方案getSearchCondition接口 2022-03-22 19:47:46 +08:00
reset 0789b1c7a9
!11 福利档案getSearchCondition接口
Merge pull request !11 from reset/archive
2022-03-22 11:46:35 +00:00
Chengliang b0982f7d7f 福利台账getSearch接口 2022-03-22 19:44:35 +08:00
钱涛 f94e64b492 Merge branch 'feature/qt' into develop 2022-03-22 10:42:47 +08:00
钱涛 0b3b971ecd 参数验证,运行期功能 2022-03-22 10:42:26 +08:00
钱涛 87d304d63e Merge remote-tracking branch 'origin/develop' into develop 2022-03-21 20:10:28 +08:00
钱涛 2f8b56e4ac 参数验证类 2022-03-21 20:09:10 +08:00
reset 7fa5f12f6e
!10 优化listpage接口
Merge pull request !10 from reset/archive
2022-03-21 08:14:47 +00:00
Chengliang e9ee672a66 社保档案listPage优化 2022-03-21 16:13:08 +08:00
钱涛 994a1dbd16 分页 2022-03-21 10:08:39 +08:00
钱涛 f0a0680bdc Merge branch 'feature/qt' into develop
# Conflicts:
#	src/com/engine/salary/common/BaseQueryParam.java
#	src/com/engine/salary/demo/DemoPageCmd.java
2022-03-21 09:36:56 +08:00
钱涛 f8d68fa7bc 分页 2022-03-21 09:33:21 +08:00
Chengliang 19dd1eed17 社保档案动态列接口 2022-03-18 18:00:51 +08:00
钱涛 54925dc51e Merge remote-tracking branch 'origin/develop' into develop 2022-03-17 15:47:42 +08:00
钱涛 eaaf69b09c Merge branch 'feature/qt' into develop 2022-03-17 15:47:31 +08:00
钱涛 5b0374ca42 分页 2022-03-17 15:47:14 +08:00
reset 4749bdbdc4
!8 社保档案详情-保存等接口
Merge pull request !8 from reset/archive
2022-03-17 07:28:29 +00:00
Chengliang 7194ae4026 社保档案详情-保存等接口 2022-03-17 15:26:33 +08:00
钱涛 a6bd9f38de Merge remote-tracking branch 'origin/develop' into develop 2022-03-17 15:15:00 +08:00
钱涛 2a6f3a10ce Merge branch 'feature/qt' into develop 2022-03-17 15:14:53 +08:00
钱涛 5a7cc85e53 分页 2022-03-17 15:14:35 +08:00
Chengliang cc9a650b92 批量保存,批量删除社保档案 2022-03-16 18:26:49 +08:00
reset 23519e2050
!6 payform 及表单组件
Merge pull request !6 from reset/archive
2022-03-16 09:06:09 +00:00