MustangDeng
|
5f2c20eaec
|
默认不启用非标功能
|
2022-05-23 13:38:48 +08:00 |
 钱涛
|
f2f678c6d1
|
核算进度
|
2022-04-29 17:15:22 +08:00 |
|
钱涛
|
d521bf5bf7
|
账套周期
|
2022-04-26 14:44:42 +08:00 |
|
钱涛
|
3b342d4ec7
|
我的薪资福利
|
2022-04-22 19:22:40 +08:00 |
 Chengliang
|
72e9e152d6
|
福利台账相关
|
2022-04-20 19:12:01 +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 |
|
钱涛
|
4db39902b5
|
公式v2
|
2022-04-14 20:46:17 +08:00 |
|
MustangDeng
|
50c03b19e0
|
Merge branch 'develop' into feature/salaryBill
# Conflicts:
# src/com/engine/salary/annotation/SalaryFormulaVar.java
|
2022-04-13 11:09:41 +08:00 |
|
MustangDeng
|
bd8305763e
|
工资单发放-编译
|
2022-04-12 10:11:53 +08:00 |
|
Chengliang
|
568cc1811e
|
薪资台账列表
|
2022-04-11 19:07:35 +08:00 |
|
MustangDeng
|
1573abd1ee
|
Revert "工资单发放-todo"
This reverts commit b850f5ad
|
2022-04-11 14:30:30 +08:00 |
|
MustangDeng
|
31acdbb606
|
Merge branch 'feature/djp' into develop
|
2022-04-11 14:29:25 +08:00 |
|
MustangDeng
|
b850f5ad8d
|
工资单发放-todo
|
2022-04-11 14:28:45 +08:00 |
|
钱涛
|
9d223c7a06
|
核算基础类
|
2022-04-06 20:01:00 +08:00 |
|
钱涛
|
5ae4eb5fc8
|
项目id
|
2022-03-28 16:36:40 +08:00 |
|
钱涛
|
c01e63040c
|
薪资项目&账套
|
2022-03-22 21:01:38 +08:00 |
|
Chengliang
|
19dd1eed17
|
社保档案动态列接口
|
2022-03-18 18:00:51 +08:00 |
|
钱涛
|
59fc1ded4e
|
Merge branch 'feature/qt' into develop
|
2022-03-16 14:30:54 +08:00 |
|
钱涛
|
00bf811075
|
考勤导出接口
|
2022-03-16 14:29:02 +08:00 |
|
钱涛
|
27c9d669f7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-15 09:56:30 +08:00 |
|
钱涛
|
eb4ca765d7
|
考勤相关接口
|
2022-03-15 09:55:58 +08:00 |
|
Chengliang
|
69a1b4d5ae
|
福利项目表单接口修复
|
2022-03-15 09:34:53 +08:00 |
|
钱涛
|
d601f2fd59
|
Merge branch 'feature/qt' into develop
|
2022-03-11 11:09:16 +08:00 |
|
钱涛
|
9676102894
|
累计bug
|
2022-03-11 11:08:50 +08:00 |
|
钱涛
|
e3c602a8a0
|
Merge branch 'feature/qt' into develop
|
2022-03-10 18:00:21 +08:00 |
|
钱涛
|
98c49db986
|
其他扣除项接口
|
2022-03-10 17:57:46 +08:00 |
|
Chengliang
|
7d245e786e
|
社保自定义福利控制器 getForm
|
2022-03-09 16:12:47 +08:00 |
|
Chengliang
|
0c3322796f
|
solve conflict
|
2022-03-09 10:09:07 +08:00 |
|
Chengliang
|
2b61b030d7
|
福利模块getForm接口
|
2022-03-07 22:22:09 +08:00 |
|
钱涛
|
382781fa26
|
列表注解
|
2022-03-07 19:27:32 +08:00 |
|
钱涛
|
1e134de35b
|
税率表详细信息接口
|
2022-03-02 11:09:23 +08:00 |
|
钱涛
|
fb42a5f041
|
删除接口ids改为json入参
|
2022-03-01 18:49:22 +08:00 |
|
MustangDeng
|
9685f03db4
|
删除demoController相关接口
|
2022-03-01 11:13:17 +08:00 |
|
钱涛
|
4a081d6ad9
|
初始化项目结构、demo样例、mybatis使用样例
|
2022-02-25 19:41:22 +08:00 |