Commit Graph

227 Commits (cdda440ef272d21a33ff73eda3dc2507c027a33d)

Author SHA1 Message Date
wangxuanran cdda440ef2 安永数据同步 2023-06-10 16:09:18 +08:00
youhong.ai cfe56ff505 修改redme 2023-06-10 15:48:57 +08:00
ic_excellent 04095b3bbd 部门,分部自定义 2023-06-09 17:33:57 +08:00
youhong.ai 1c4fe8709d 修改获取cus日志修改 2023-06-09 17:03:23 +08:00
wangxuanran cf0af8919e gu ji shi ge shi hua de wen ti 2023-06-07 11:46:25 +08:00
wangxuanran 777ab4ac11 xiugai 2023-06-07 11:41:08 +08:00
youhong.ai 8af8697194 修改sql文件 2023-06-07 11:33:54 +08:00
youhong.ai 78de340044 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并
2023-06-02 11:29:29 +08:00
youhong.ai 17ba40eee8 修改关键字定位方式 2023-06-02 11:29:18 +08:00
ic_excellent a470f368cb 修复collection bug 2023-06-02 11:04:26 +08:00
ic_excellent 2af595ad81 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并
2023-06-02 11:00:28 +08:00
ic_excellent 2dbea71ba0 上传文件 2023-06-02 11:00:00 +08:00
wangxuanran 685240f2f8 极兔ncc 自定义sql用{mainTable}代替当前表名代码同步 2023-05-31 10:07:27 +08:00
youhong.ai 7e6fa007e0 fix deal whti maping bug rs 大小写 2023-05-31 09:40:59 +08:00
youhong.ai bbcd42e79f fix rs 初始化失败 2023-05-30 11:50:41 +08:00
youhong.ai a4f9ded450 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并
2023-05-23 14:45:32 +08:00
youhong.ai 04a019b5ce 修改 2023-05-23 14:45:23 +08:00
chaoyang.he cc015d6098 航天科技-台账同步 2023-05-21 20:20:30 +08:00
chaoyang.he 0e2e6325f3 文件备份---何朝阳 2023-05-17 10:29:15 +08:00
ic_excellent 3b00297fef Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并冲突
2023-05-16 14:54:01 +08:00
ic_excellent a45c94e1ee 保时捷开发 2023-05-16 14:51:30 +08:00
chaoyang.he f2b938e668 Merge remote-tracking branch 'origin/dev' into dev 2023-05-15 17:58:59 +08:00
chaoyang.he 0284f4c70b 文件备份---何朝阳 2023-05-15 17:58:42 +08:00
youhong.ai 402082f038 mapper拼接类 2023-05-12 21:17:28 +08:00
youhong.ai ad6c60dc9f mapper拼接类 2023-05-12 21:14:04 +08:00
youhong.ai 8b8ab74483 mapper拼接类 2023-05-12 21:12:06 +08:00
wangxuanran ce90fa1def 修复自定义sql方法bug 2023-05-12 15:55:33 +08:00
wangxuanran a0bc9c30b9 建模生成json类日志文件修改 2023-05-12 13:42:20 +08:00
youhong.ai b5d95fb201 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
修复dealwith bug、洲际酒店任务元素开发
2023-05-12 11:15:41 +08:00
youhong.ai 0cc0b9889a 洲际酒店任务元素开发、delwithbug修复 2023-05-12 11:15:29 +08:00
wangxuanran cb02ca6184 中船流程推送cms系统 2023-05-11 15:25:53 +08:00
youhong.ai daaefd64c2 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并远程分支
2023-05-10 14:15:35 +08:00
youhong.ai 7772b404dc 雅诗兰黛拆单报表、洲际酒店任务元素 2023-05-10 14:15:05 +08:00
ic_excellent a66422b667 解决冲突 2023-05-06 15:21:42 +08:00
ic_excellent 3ed657ebec 修改文件 2023-05-06 15:17:47 +08:00
ic_excellent a5f477ad9d 修改 2023-05-06 15:15:28 +08:00
ic_excellent e3a1a7060e Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-05-06 13:51:48 +08:00
ic_excellent 78140f7c35 提交 2023-05-06 13:51:21 +08:00
wangxuanran d78176c580 代码备份提交 2023-05-04 14:34:40 +08:00
youHong.ai aa83695461 老项目依赖上传 2023-04-25 10:22:21 +08:00
youHong.ai edb807e430 添加老项目代码,雅诗兰黛代码初始化 2023-04-25 10:20:19 +08:00
youHong.ai 55de1615a9 修改常用信息,添加git操作 2023-04-24 14:09:53 +08:00
youHong.ai c69aeb13bf 修改dealWithMapping的默认值空指针异常bug修改 2023-04-24 13:52:16 +08:00
youHong.ai e23fc2161e 邮箱黑名单 2023-04-21 15:28:34 +08:00
youHong.ai 1aac6f6cc4 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
float精度修复
2023-04-20 15:19:57 +08:00
youHong.ai 01c6cf1cdc 修改float精度问题 2023-04-20 15:19:49 +08:00
ic_excellent 0e77a487d8 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-04-20 14:18:43 +08:00
ic_excellent c9aee48ecd 信银知识产权局 2023-04-20 14:18:27 +08:00
youHong.ai a691c6def9 签字意见 2023-04-17 22:47:28 +08:00
youHong.ai abf48d1d7d 冲突解决 2023-04-14 10:19:25 +08:00