Commit Graph

29 Commits

Author SHA1 Message Date
钱涛 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 7d245e786e 社保自定义福利控制器 getForm 2022-03-09 16:12:47 +08:00
Chengliang 0c3322796f solve conflict 2022-03-09 10:09:07 +08:00
钱涛 880cf9ef66 excel导入导出 2022-03-09 09:58:36 +08:00
Chengliang 91958201e5 福利模块insert getForm delete update copy接口 2022-03-09 09:42:10 +08:00
钱涛 e860b30567 累计附加接口 2022-03-08 18:10:03 +08:00
钱涛 9de0f08415 日期转换 2022-03-08 15:40:26 +08:00
钱涛 c8b05f5ef1 查询参数 2022-03-08 13:17:54 +08:00
Chengliang 2b61b030d7 福利模块getForm接口 2022-03-07 22:22:09 +08:00
钱涛 382781fa26 列表注解 2022-03-07 19:27:32 +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
钱涛 aa528eccd8 sql异常 2022-03-02 14:07:18 +08:00
钱涛 1e134de35b 税率表详细信息接口 2022-03-02 11:09:23 +08:00
钱涛 fb42a5f041 删除接口ids改为json入参 2022-03-01 18:49:22 +08:00
钱涛 b56a48c885 税率接口 2022-03-01 18:31:29 +08:00
钱涛 8922047306 税率接口及相关基础类 2022-03-01 16:45:57 +08:00
钱涛 fb56c4d379 Merge remote-tracking branch 'origin/master' 2022-03-01 13:45:19 +08:00
钱涛 1519c0a79c mysql查询语句拼接 2022-03-01 13:44:38 +08:00
MustangDeng 9685f03db4 删除demoController相关接口 2022-03-01 11:13:17 +08:00
钱涛 f591c09dc9 个税扣缴义务人相关接口(6) 2022-02-28 17:19:07 +08:00
钱涛 a35259c1ef 异常处理框架 2022-02-28 11:12:55 +08:00
钱涛 4a081d6ad9 初始化项目结构、demo样例、mybatis使用样例 2022-02-25 19:41:22 +08:00