 钱涛
|
e1a075cab3
|
fix
|
2022-06-22 19:26:05 +08:00 |
|
钱涛
|
15fbf8ac91
|
fix
|
2022-06-22 13:45:26 +08:00 |
|
钱涛
|
a577645329
|
fix
|
2022-06-22 10:58:18 +08:00 |
|
钱涛
|
fc35eff75d
|
fix
|
2022-06-21 22:37:22 +08:00 |
|
钱涛
|
e1629a021e
|
oracle错误和薪资项目错误
|
2022-06-21 15:08:23 +08:00 |
|
钱涛
|
ff88b1f9ca
|
员工字段不可重复
|
2022-06-21 11:38:55 +08:00 |
|
钱涛
|
3363120c44
|
修复核算分权的问题
|
2022-06-20 19:39:01 +08:00 |
|
钱涛
|
5cea57d477
|
fix bug
|
2022-06-17 17:22:48 +08:00 |
MustangDeng
|
c701314f15
|
fix bug 福利方案删除多余的编辑
|
2022-06-16 22:09:50 +08:00 |
|
MustangDeng
|
e49f68b842
|
fix bug 45
|
2022-06-16 21:04:06 +08:00 |
|
钱涛
|
dfe8fdf57c
|
fixbug
|
2022-06-16 19:06:45 +08:00 |
|
钱涛
|
035503f26c
|
fixbug
|
2022-06-16 17:55:26 +08:00 |
|
钱涛
|
5396d7bee3
|
加解密
|
2022-06-16 14:22:01 +08:00 |
|
钱涛
|
3e93a85873
|
Merge branch 'feature/authitem' into release
|
2022-06-16 14:21:38 +08:00 |
|
钱涛
|
b5871e1ea9
|
权限项
|
2022-06-16 14:13:22 +08:00 |
|
MustangDeng
|
f51a4e4fd7
|
加解密
|
2022-06-16 11:30:28 +08:00 |
|
MustangDeng
|
9042a9bbed
|
加解密
|
2022-06-16 11:01:03 +08:00 |
|
MustangDeng
|
bd99d3ccf8
|
加解密问题
|
2022-06-16 10:31:11 +08:00 |
|
MustangDeng
|
fc3cbe8111
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-16 10:24:58 +08:00 |
|
MustangDeng
|
2badaab552
|
加解密问题
|
2022-06-16 10:24:43 +08:00 |
|
钱涛
|
17dbef3ef2
|
sql
|
2022-06-15 17:53:12 +08:00 |
|
MustangDeng
|
3c13b90a4d
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-15 17:04:03 +08:00 |
|
MustangDeng
|
62054871ce
|
发送工资单
|
2022-06-15 17:03:48 +08:00 |
|
钱涛
|
2731e4eddd
|
sql
|
2022-06-15 16:31:40 +08:00 |
|
钱涛
|
455ff23134
|
申报表导出修改
|
2022-06-15 16:02:34 +08:00 |
|
钱涛
|
f5b8806eff
|
账套
|
2022-06-15 15:27:23 +08:00 |
|
钱涛
|
b42586600a
|
fix申报表
|
2022-06-15 12:03:17 +08:00 |
|
钱涛
|
baa06f4011
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-15 11:02:55 +08:00 |
|
钱涛
|
cfe2d3c1dc
|
fix申报表
|
2022-06-15 11:02:44 +08:00 |
|
MustangDeng
|
0e0cc9f97b
|
福利档案列表
|
2022-06-15 11:01:09 +08:00 |
|
钱涛
|
fda668ba90
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-15 10:24:54 +08:00 |
|
钱涛
|
7955d67da6
|
fix申报表
|
2022-06-15 10:24:46 +08:00 |
|
MustangDeng
|
d5228ff1bf
|
福利档案列表
|
2022-06-15 10:23:39 +08:00 |
|
钱涛
|
8d6a3c41d7
|
fix人员同步
|
2022-06-15 09:29:43 +08:00 |
|
钱涛
|
5634377e47
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-14 16:05:58 +08:00 |
|
钱涛
|
0e8c916262
|
保存
|
2022-06-14 16:05:47 +08:00 |
|
MustangDeng
|
8846346dda
|
台账核算回滚数据
|
2022-06-14 16:05:23 +08:00 |
|
钱涛
|
811a90f50d
|
账套项目的顺序性
|
2022-06-14 11:13:31 +08:00 |
|
钱涛
|
bf7d8dd634
|
导入时人员唯一校验
|
2022-06-13 17:05:36 +08:00 |
|
钱涛
|
b78e96c875
|
考勤列表适配sqlserver
|
2022-06-13 15:37:52 +08:00 |
|
钱涛
|
081747b334
|
考勤引用修复
|
2022-06-13 10:52:32 +08:00 |
|
钱涛
|
1aee6f7ef0
|
往期累计
|
2022-06-10 18:16:11 +08:00 |
|
钱涛
|
99e7c1eaef
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-10 18:07:36 +08:00 |
|
钱涛
|
33914eae1d
|
解密
|
2022-06-10 18:07:25 +08:00 |
|
MustangDeng
|
3bedc88f44
|
福利加解密
|
2022-06-10 18:01:55 +08:00 |
|
MustangDeng
|
fcb55bc269
|
fix 冲突
|
2022-06-10 17:15:19 +08:00 |
|
钱涛
|
df7e3febc3
|
冲突
|
2022-06-10 17:03:25 +08:00 |
|
钱涛
|
e6c6b8eb57
|
Merge branch 'auth-fl' into release
# Conflicts:
# resource/sql/分权.sql
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
|
2022-06-10 16:58:45 +08:00 |
|
钱涛
|
6ddf483767
|
加解密
|
2022-06-10 16:43:38 +08:00 |
|
MustangDeng
|
9315882742
|
福利档案列表log
|
2022-06-10 16:35:01 +08:00 |