Commit Graph

392 Commits (dev)

Author SHA1 Message Date
ic_excellent d05e2dfd08 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
处理冲入
2023-08-14 15:39:23 +08:00
ic_excellent 2ff4e22bbd 解决异常 2023-08-14 15:38:58 +08:00
wangxuanran 341fa9e043 登录科技考勤action修改 2023-07-31 16:07:08 +08:00
wangxuanran 6bbb49f0a1 自定义日志写入 2023-07-31 15:37:50 +08:00
ic_excellent 5a8ef40e18 优化ResponseDeal 2023-07-27 14:12:35 +08:00
ic_excellent afb20960b9 修复重复问题 2023-07-27 13:07:13 +08:00
ic_excellent ef4d57f1d0 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
冲突
2023-07-27 12:47:32 +08:00
wangxuanran 6141de68ac 合并 2023-07-27 12:47:08 +08:00
wangxuanran 5cf9c44c6c 合并 2023-07-27 12:46:05 +08:00
ic_excellent 975908717b 提交代码 2023-07-27 12:44:53 +08:00
wangxuanran ee84e559e6 胸科医院代码上传 2023-07-27 12:44:37 +08:00
youhong.ai ef8230a395 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
hebing
2023-07-26 12:39:13 +08:00
youhong.ai 29bc506704 添加用户id 2023-07-26 12:38:43 +08:00
ic_excellent f0e99efd26 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
冲突处理
2023-07-24 16:55:38 +08:00
ic_excellent 25c729783d 信银 2023-07-24 16:55:24 +08:00
wangxuanran 0836261a05 接口数据同步自定义sql打印cus 以及参数map 2023-07-24 10:46:45 +08:00
wangxuanran bfec43d804 sql format 异常捕获提升 2023-07-21 22:09:32 +08:00
weilin.zhu 194042f5e9 ASC 精品酒业 凭证相关接口问题修复 2023-07-20 16:45:26 +08:00
ic_excellent dedfee53c1 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
处理冲突
2023-07-20 15:52:59 +08:00
ic_excellent 098c568713 上海大数据中心 2023-07-20 15:52:43 +08:00
weilin.zhu d54194caf3 Merge remote-tracking branch 'origin/dev' into dev 2023-07-20 13:24:04 +08:00
weilin.zhu 39a7295db8 ASC 精品酒业 凭证相关接口问题修复 2023-07-20 13:23:07 +08:00
wangxuanran 7970a2456b 同步优化 2023-07-20 13:17:45 +08:00
wangxuanran 0de7a593e9 同步优化 2023-07-20 13:03:20 +08:00
wangxuanran 9658ce154f 响应回写问题修复 2023-07-20 10:32:08 +08:00
ic_excellent fe37d194a3 同步处理明细 2023-07-19 17:19:33 +08:00
ic_excellent 6d9f347911 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
冲突处理
2023-07-19 17:18:18 +08:00
ic_excellent 0d95cb5746 同步处理明细 2023-07-19 17:17:57 +08:00
wangxuanran f042d058f0 获取下一个人员/部门方法优化 2023-07-19 15:35:30 +08:00
ic_excellent eb7636fc39 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
2023-07-19 14:02:00 +08:00
ic_excellent 6cdae28cc4 上海大数据中心 2023-07-19 14:01:33 +08:00
wangxuanran 1dff070cc1 inser/update state中取消回调 2023-07-19 13:40:15 +08:00
wangxuanran 92503d4325 问题修复 2023-07-19 13:28:32 +08:00
wangxuanran 6b34fa2d76 新增获取下一个部门/人员方法 2023-07-19 11:31:27 +08:00
ic_excellent 7e117e0c76 同步增加行回调方法 2023-07-18 17:13:41 +08:00
ic_excellent 588e52939a 修复同步问题 2023-07-18 16:52:31 +08:00
ic_excellent f433f89ed5 修改同步问题 2023-07-18 16:25:34 +08:00
ic_excellent 7633b880fe 同步问题修改 2023-07-18 16:10:42 +08:00
ic_excellent c8dc531276 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
冲突处理
2023-07-18 15:12:46 +08:00
ic_excellent 10bde4ca2c 问题修改 2023-07-18 15:12:03 +08:00
wangxuanran 0c8f05baa3 问题修复 2023-07-18 15:10:48 +08:00
ic_excellent 8dca39fe74 同步问题修改 2023-07-18 15:06:57 +08:00
ic_excellent 0f620a7e22 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
处理冲突
2023-07-18 15:00:26 +08:00
ic_excellent 030e460c62 同步处理修改 2023-07-18 15:00:07 +08:00
ic_excellent a356e37bdb 上海大数据中心修改 2023-07-18 14:49:21 +08:00
wangxuanran 28f6159601 CusHttpServletRequest问题修复 2023-07-18 14:46:28 +08:00
youhong.ai 24faa6c603 自动打包优化 2023-07-18 11:42:11 +08:00
youhong.ai 093c2ef83a 自动打包优化 2023-07-18 11:41:39 +08:00
youhong.ai 40a3a998d5 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并
2023-07-18 11:38:17 +08:00
youhong.ai 83f6ca026c 自动打包优化 2023-07-18 11:38:06 +08:00