18895359881@163.com
|
a5b73098c9
|
Merge branch 'develop' into test_xxy
|
2022-04-16 16:14:56 +08:00 |
|
18895359881@163.com
|
3e64b1cfde
|
薪酬接口
|
2022-04-16 15:33:51 +08:00 |
 钱涛
|
941a34990f
|
Merge branch 'feature/acct' into develop
# Conflicts:
# src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
# src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
|
2022-04-14 20:49:24 +08:00 |
 Chengliang
|
2eadc713e1
|
薪资台账保存核算
|
2022-04-14 11:54:16 +08:00 |
|
钱涛
|
a2102a49b4
|
核算v3
|
2022-04-13 14:18:00 +08:00 |
|
reset
|
ac86ad0d62
|
!16 台账
Merge pull request !16 from reset/archive
|
2022-04-12 11:31:07 +00:00 |
|
Chengliang
|
985456ed14
|
社保台账
|
2022-04-12 19:29:19 +08:00 |
|
钱涛
|
692c2f5a79
|
核算
|
2022-04-12 19:25:19 +08:00 |
|
钱涛
|
43d97d87b3
|
核算基础公式
|
2022-04-11 20:46:25 +08:00 |
|
钱涛
|
a069447f02
|
核算基础公式
|
2022-04-11 20:17:47 +08:00 |
|
钱涛
|
0b72b2e6cb
|
核算v2
|
2022-04-08 19:08:59 +08:00 |
|
钱涛
|
23adb455fd
|
核算v1
|
2022-04-08 16:30:10 +08:00 |
|
钱涛
|
0dedda4dbd
|
核算
|
2022-04-07 16:54:10 +08:00 |
|
钱涛
|
9d223c7a06
|
核算基础类
|
2022-04-06 20:01:00 +08:00 |
|
钱涛
|
75f64648d6
|
档案类修复
|
2022-04-06 13:21:30 +08:00 |
|
钱涛
|
8d9ff236f7
|
档案类修复
|
2022-04-06 11:02:02 +08:00 |
|
钱涛
|
3307c5c67e
|
薪资档案后续接口
|
2022-04-02 15:34:27 +08:00 |
|
钱涛
|
126444b9f3
|
薪资档案
|
2022-04-01 18:25:24 +08:00 |
|
钱涛
|
e9e03880d9
|
Merge branch 'feature/qt' into develop
|
2022-03-31 18:42:06 +08:00 |
|
钱涛
|
a8732708a8
|
薪资档案导入
|
2022-03-31 15:41:55 +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 |
|
钱涛
|
50a62e3b29
|
Merge branch 'feature/qt' into develop
|
2022-03-30 12:16:07 +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 |
|
钱涛
|
c9281bd6db
|
Merge branch 'feature/qt' into develop
|
2022-03-25 18:05:18 +08:00 |
|
钱涛
|
1db71a97ff
|
薪资账套
|
2022-03-25 18:05:07 +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 |
|
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 |
|
钱涛
|
0b3b971ecd
|
参数验证，运行期功能
|
2022-03-22 10:42:26 +08:00 |
|
钱涛
|
2f8b56e4ac
|
参数验证类
|
2022-03-21 20:09:10 +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 |
|
钱涛
|
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
|
23519e2050
|
!6 payform 及表单组件
Merge pull request !6 from reset/archive
|
2022-03-16 09:06:09 +00:00 |
|
Chengliang
|
b0124e250d
|
福利档案payForm及表单组件
|
2022-03-16 17:04:21 +08:00 |
|
钱涛
|
00bf811075
|
考勤导出接口
|
2022-03-16 14:29:02 +08:00 |
|
钱涛
|
eb4ca765d7
|
考勤相关接口
|
2022-03-15 09:55:58 +08:00 |
|
钱涛
|
fe14008e39
|
sql适配
|
2022-03-12 17:45:39 +08:00 |
|
钱涛
|
98c49db986
|
其他扣除项接口
|
2022-03-10 17:57:46 +08:00 |
|
钱涛
|
d55fca8eeb
|
导出明细
|
2022-03-10 11:09:08 +08:00 |
|
钱涛
|
0759628eb2
|
excel导入导出
|
2022-03-07 15:08:56 +08:00 |
|
钱涛
|
c183a11cba
|
统一税率保存参数
|
2022-03-03 13:50:03 +08:00 |
|
钱涛
|
8922047306
|
税率接口及相关基础类
|
2022-03-01 16:45:57 +08:00 |
MustangDeng
|
9685f03db4
|
删除demoController相关接口
|
2022-03-01 11:13:17 +08:00 |
|
钱涛
|
a35259c1ef
|
异常处理框架
|
2022-02-28 11:12:55 +08:00 |
|
钱涛
|
4a081d6ad9
|
初始化项目结构、demo样例、mybatis使用样例
|
2022-02-25 19:41:22 +08:00 |