Commit Graph

35 Commits

Author SHA1 Message Date
钱涛 2ce8d8ca5d Merge branch 'feature/qt' into develop 2022-03-11 18:14:35 +08:00
钱涛 502450baab bug 2022-03-11 18:14:19 +08:00
钱涛 dded82ac7c Merge branch 'feature/qt' into develop 2022-03-11 17:15:43 +08:00
钱涛 7f3b381e5c 导出过滤 2022-03-11 17:15:33 +08:00
钱涛 333af1c924 Merge remote-tracking branch 'origin/feature/qt' into develop 2022-03-11 16:20:05 +08:00
钱涛 1c46bd28f7 累计bug 2022-03-11 16:19:47 +08:00
钱涛 1a7478ff57 Merge branch 'feature/qt' into develop 2022-03-11 15:15:14 +08:00
钱涛 822f9d4289 删除本地代码 2022-03-11 15:14:32 +08:00
钱涛 8aabe78182 Merge branch 'feature/qt' into develop 2022-03-11 13:45:03 +08:00
钱涛 d748f3733a 累计bug 2022-03-11 13:44:47 +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
钱涛 3f32fa98d6 累计实体错误 2022-03-11 10:18:30 +08:00
钱涛 934e9b1729 Merge branch 'feature/qt' into develop 2022-03-11 10:06:47 +08:00
钱涛 92fc902fba 明细表加checkbox 2022-03-11 10:06:13 +08:00
钱涛 628253ed0c Merge branch 'feature/qt' into develop
# Conflicts:
#	src/com/engine/salary/init.sql
2022-03-10 19:02:28 +08:00
钱涛 882665ff09 明细表加checkbox 2022-03-10 19:01:58 +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
钱涛 8a7251c076 Merge branch 'feature/qt' into develop
# Conflicts:
#	src/com/engine/salary/web/AddUpDeductionController.java
2022-03-10 11:10:40 +08:00
钱涛 d55fca8eeb 导出明细 2022-03-10 11:09:08 +08:00
钱涛 8da28ec05f Merge branch 'feature/qt' into develop
# Conflicts:
#	src/com/engine/salary/init.sql
2022-03-09 19:00:21 +08:00
钱涛 1319543251 累计接口 2022-03-09 18:58:30 +08:00
钱涛 7ee952e63c 累计 2022-03-09 16:40:14 +08:00
Chengliang 0c3322796f solve conflict 2022-03-09 10:09:07 +08:00
钱涛 880cf9ef66 excel导入导出 2022-03-09 09:58:36 +08:00
钱涛 0e3412ad44 列表checkbox 2022-03-08 18:14:20 +08:00
钱涛 e860b30567 累计附加接口 2022-03-08 18:10:03 +08:00
钱涛 a190dc439d 日期转换 2022-03-08 16:35:05 +08:00
钱涛 9de0f08415 日期转换 2022-03-08 15:40:26 +08:00
钱涛 c8b05f5ef1 查询参数 2022-03-08 13:17:54 +08:00
钱涛 0759628eb2 excel导入导出 2022-03-07 15:08:56 +08:00
钱涛 97cc5d154f 累计附加扣除-条件接口 2022-03-04 10:10:38 +08:00
钱涛 b028ad6845 税率修改接口bug 2022-03-03 14:52:50 +08:00
钱涛 c183a11cba 统一税率保存参数 2022-03-03 13:50:03 +08:00