Harryxzy
|
5bee0f3b4d
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-09 09:48:56 +08:00 |
|
Harryxzy
|
e24579f363
|
Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01
|
2023-06-09 09:48:27 +08:00 |
|
Harryxzy
|
93a7dcd59f
|
数据透视 fix WeaTable
|
2023-06-08 18:04:25 +08:00 |
|
Harryxzy
|
e464ca8ba6
|
薪资账套中薪资项目可以删除
|
2023-06-08 15:30:52 +08:00 |
|
Harryxzy
|
4b574c9e57
|
报表数据透视提速
|
2023-06-08 14:00:51 +08:00 |
|
Harryxzy
|
3d11c74d32
|
报表数据透视fixbug
|
2023-06-08 12:25:11 +08:00 |
 钱涛
|
7b0648cc68
|
拦截工资单demo
|
2023-06-08 10:40:00 +08:00 |
|
Harryxzy
|
50fd5812d4
|
数据透视功能改为post
|
2023-06-08 10:24:28 +08:00 |
|
钱涛
|
458b04703d
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-08 10:15:59 +08:00 |
|
钱涛
|
a4679d7a5b
|
展示底层异常
|
2023-06-08 10:14:37 +08:00 |
|
Harryxzy
|
94edee7f8c
|
Merge branch 'feature/taxAgentSorted' into release/2.8.3.2306.01
|
2023-06-08 09:03:21 +08:00 |
sy
|
5a54b83b4a
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-07 18:41:22 +08:00 |
|
sy
|
054d880afa
|
薪酬系统-福利档案，likecondition条件取消mysql指定
|
2023-06-07 18:40:55 +08:00 |
|
钱涛
|
799b3d9f64
|
Merge branch 'feature/短信邮件' into release/2.8.3.2306.01
|
2023-06-07 17:32:48 +08:00 |
|
钱涛
|
7701420430
|
邮件去除图片
|
2023-06-07 17:19:00 +08:00 |
|
Harryxzy
|
dcb28b052f
|
数据透视功能-分页+排序
|
2023-06-07 16:50:09 +08:00 |
|
Harryxzy
|
deaa9acfa0
|
Merge branch 'release/2.8.3.2306.01' into feature/statisticDataPerspective
|
2023-06-07 15:44:51 +08:00 |
|
Harryxzy
|
4617005e1f
|
数据透视功能
|
2023-06-07 15:43:23 +08:00 |
|
sy
|
4c1e7da51b
|
薪酬系统-福利档案，福利档案导出增加工号信息
|
2023-06-07 15:40:38 +08:00 |
|
钱涛
|
77e9b0a74b
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-07 15:12:40 +08:00 |
|
Harryxzy
|
9e794c988a
|
Merge branch 'fix/balanceImportBUG_0511' into release/2.8.3.2306.01
|
2023-06-07 14:36:27 +08:00 |
|
钱涛
|
3498005a11
|
工资单发放
|
2023-06-07 14:21:47 +08:00 |
|
Harryxzy
|
a6356a7d3d
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-07 12:27:29 +08:00 |
|
Harryxzy
|
f4627b53f9
|
fix没有公式id内容bug
|
2023-06-07 12:23:05 +08:00 |
|
钱涛
|
37d9c04a30
|
去除发放状态中文转换
|
2023-06-07 09:43:54 +08:00 |
|
钱涛
|
d4c8a66fcf
|
注释优化
|
2023-06-07 09:31:46 +08:00 |
|
钱涛
|
4a258aa45b
|
替换短信发送方法
|
2023-06-06 16:40:09 +08:00 |
|
钱涛
|
f154753698
|
拦截短信
|
2023-06-06 15:02:53 +08:00 |
|
Harryxzy
|
1584a27fe8
|
个税扣缴义务人排序
|
2023-06-06 14:44:00 +08:00 |
|
钱涛
|
4358dc20a5
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-06 14:24:23 +08:00 |
|
钱涛
|
a308ee8d1f
|
获取员工短信内容
|
2023-06-06 14:21:35 +08:00 |
|
钱涛
|
0e5eb1b11e
|
工资单发送
|
2023-06-06 11:48:19 +08:00 |
|
钱涛
|
993db67601
|
公共进度条功能
|
2023-06-06 10:30:49 +08:00 |
|
钱涛
|
4582ab1e51
|
邮件审批方法
|
2023-06-06 09:51:07 +08:00 |
|
Harryxzy
|
0d3a48e7ea
|
个税扣缴义务人排序
|
2023-06-05 15:14:25 +08:00 |
|
钱涛
|
91e3b335dd
|
工资单通道
|
2023-06-05 13:35:17 +08:00 |
|
Harryxzy
|
466412a444
|
Merge branch 'fix/salaryAcctSearchLockItem' into release/2.8.3.2306.01
|
2023-06-05 09:53:13 +08:00 |
|
Harryxzy
|
30e2c489ea
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-05 09:52:57 +08:00 |
|
sy
|
f8e9e8513d
|
Merge remote-tracking branch 'remotes/origin/feature/v4-addWorkcodeQuery-0601' into release/2.8.3.2306.01
|
2023-06-05 09:17:54 +08:00 |
|
Harryxzy
|
1294e86c8c
|
导入自动锁定添加开关
|
2023-06-02 15:25:46 +08:00 |
|
Harryxzy
|
52b592dd7e
|
薪资核算获取加锁的值时增加项目条件，提速
|
2023-06-02 15:06:07 +08:00 |
|
Harryxzy
|
d53d7a33d7
|
删除锁定多余代码
|
2023-06-02 14:47:15 +08:00 |
|
钱涛
|
0da2bfa55a
|
邮件暂存
|
2023-06-02 14:38:56 +08:00 |
|
Harryxzy
|
74c5b4f19f
|
薪资项目 和 字段管理的排序
|
2023-06-01 17:52:31 +08:00 |
|
钱涛
|
4be4acc5d8
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2023-06-01 11:49:16 +08:00 |
|
sy
|
007328476a
|
薪酬系统-薪资核算，薪资核算列表工号查询逻辑优化
|
2023-06-01 11:17:06 +08:00 |
|
钱涛
|
3ce388a935
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-01 11:05:26 +08:00 |
|
钱涛
|
0472c7b757
|
显示字段管理默认使用列
报表空数据处理
|
2023-06-01 11:05:15 +08:00 |
|
Harryxzy
|
4e04b6e268
|
薪资核算导入，选择表单字段获取未分类
|
2023-06-01 10:30:33 +08:00 |
|
sy
|
fb03cf98a7
|
薪酬系统，福利台账、薪资档案、薪资核算增加工号查询
|
2023-05-31 11:49:40 +08:00 |