Commit Graph

666 Commits

Author SHA1 Message Date
yuqh 20d0d9383d Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-26 16:16:49 +08:00
xiang2lin 466a89e1c4 电子回单临时文件 2024-06-26 15:44:58 +08:00
xiang2lin 6e77825ce2 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-26 15:44:34 +08:00
476474485@qq.com 783d8e5606 Merge remote-tracking branch 'origin/dev' into dev 2024-06-26 14:03:53 +08:00
476474485@qq.com 5e3f82f111 增加tlo依赖,配置 2024-06-26 13:49:28 +08:00
hecan 55695a0257 判断字段是否是必填项,操作日志新增类型 2024-06-26 10:41:57 +08:00
476474485@qq.com 0c0e286798 Merge remote-tracking branch 'origin/dev' into dev 2024-06-26 10:17:17 +08:00
476474485@qq.com 1645913af7 增加tlo依赖,配置 2024-06-26 10:16:54 +08:00
lvleigang 8239fca7b5 修改配置文件 2024-06-26 10:16:30 +08:00
lvleigang 1603610d28 修改主数据 2024-06-26 10:15:57 +08:00
476474485@qq.com 671ec5475e 增加tlog配置
https://tlog.yomahub.com/pages/5b7bd2/
2024-06-26 09:11:01 +08:00
476474485@qq.com c2c3435967 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-26 09:08:24 +08:00
lvleigang 6250ce4a83 修改主数据 2024-06-25 17:20:07 +08:00
xiang2lin 5991883e53 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-25 16:46:46 +08:00
yuqh f35603466a Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-25 15:57:23 +08:00
yuqh f601167183 收款单dao 2024-06-25 15:57:15 +08:00
lvleigang bbd2bbb428 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-25 15:50:26 +08:00
lvleigang dfd77dc842 修改人员脚本 2024-06-25 15:40:34 +08:00
lvleigang 465ede3d79 Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into dev 2024-06-25 14:12:24 +08:00
lvleigang 4b39c006f5 主数据发送判断是否可以发送,返回null 2024-06-25 14:12:15 +08:00
yuqh 3e726e8b3c 数智办公对接数智财务逻辑 2024-06-25 14:10:22 +08:00
yuqh ef065c3f8c MDM公用文件 2024-06-25 14:08:07 +08:00
xiang2lin f6223037d1 币种枚举 2024-06-25 13:33:47 +08:00
xiang2lin 3f9058de62 交易明细查询 2024-06-25 11:20:18 +08:00
yuqh 466aaaf04f Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-25 11:02:14 +08:00
hecan c2266e103d 调整增删改查逻辑,使用主表id当作明细的formmain_id 2024-06-25 11:01:39 +08:00
yuqh ce9f561bbe Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-25 09:54:16 +08:00
hecan 15b031bd36 新增字段data_id为第三方主键id,用第三方主键来操作 2024-06-25 09:52:29 +08:00
yuqh e6d814e405 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-25 09:29:17 +08:00
yuqh 5c77244d24 MDM公用文件 2024-06-25 09:25:06 +08:00
lvleigang 0e7b05e788 主数据创建表添加第三方主键id 2024-06-25 09:22:24 +08:00
lvleigang f495d7b88d Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into dev 2024-06-25 08:59:10 +08:00
lvleigang aea0ee873b 主数据删除修改 2024-06-25 08:59:00 +08:00
yuqh 816bdbc51b Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 19:03:30 +08:00
hecan f9a0375063 修改明细表的id 2024-06-24 19:03:00 +08:00
yuqh 738eb5801f Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 19:01:39 +08:00
hecan cc866f471d 使用传入的id 2024-06-24 19:00:54 +08:00
xiang2lin 1039fa7295 cbs 2024-06-24 18:52:24 +08:00
xiang2lin fa3f5eb622 cbs 2024-06-24 18:51:59 +08:00
xiang2lin f779db543c cbs 2024-06-24 18:51:00 +08:00
yuqh 9637c73b96 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 18:06:12 +08:00
hecan 4b27586193 查询接口新增判断,明细表是否为空 2024-06-24 18:03:02 +08:00
yuqh dfc406864b Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 17:48:42 +08:00
lvleigang 08e0a56099 任务计划,添加查询数据源 2024-06-24 17:48:12 +08:00
hecan 2ae7391e65 放开测试时候注释掉的操作日志保存接口 2024-06-24 17:44:13 +08:00
hecan 6cdbd049a7 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 2024-06-24 17:42:29 +08:00
yuqh 2208514dc7 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
 Conflicts:
	pom.xml
	service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
2024-06-24 17:36:00 +08:00
hecan 422f5f4469 调整修改和新增得参数,为表名称 2024-06-24 17:33:14 +08:00
xiang2lin 4d6c7f5d03 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 16:01:05 +08:00
yuqh aedf496c2a MDM公用文件 2024-06-24 16:00:45 +08:00