Commit Graph

994 Commits

Author SHA1 Message Date
lulz1 19aa0d62c4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-06 15:08:56 +08:00
lulz1 ea72b22488 同步代码 2024-03-06 15:06:03 +08:00
wanglf3 e757b763db 1.携程酒店明细字段确认和补充。 2024-03-06 14:49:11 +08:00
lulz1 191e700926 同步代码 2024-03-06 14:44:50 +08:00
lulz1 a8680bb972 Merge remote-tracking branch 'origin/dev' into dev 2024-03-06 14:18:43 +08:00
lulz1 2ee9d59744 同步代码 2024-03-06 14:15:49 +08:00
wanglf3 fc06ce6ccc 1.携程飞机字段明细设值 2024-03-06 14:11:44 +08:00
lulz1 9599244d62 同步代码 2024-03-06 13:25:00 +08:00
wanglf3 0a473cee6f 1.同程打车信息订单数据创建 2024-03-06 13:13:29 +08:00
lulz1 412d91bd16 同步代码 2024-03-06 13:06:46 +08:00
lulz1 7c1db77cc5 同步代码 2024-03-06 12:57:27 +08:00
huangxh3 899738965b Merge remote-tracking branch 'origin/dev' into dev 2024-03-06 12:48:01 +08:00
huangxh3 30c0305b72 修改 2024-03-06 12:47:47 +08:00
wanglf3 893f234258 1.更新携程和同程订单明细字段设置 2024-03-06 10:59:24 +08:00
huangxh3 d71705f9fa Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/chint/domain/factoriy/order_detail/LYOrderExtensionFactoryImpl.java
2024-03-06 10:43:38 +08:00
huangxh3 cd45927e1d 修改 2024-03-06 10:35:11 +08:00
lulz1 de768587cb 同步代码 2024-03-06 10:33:15 +08:00
lulz1 e74195f237 同步代码 2024-03-06 10:27:47 +08:00
lulz1 7f77a2f0ba 同步代码 2024-03-06 10:20:18 +08:00
lulz1 78a7c44bf9 同步代码 2024-03-06 09:31:39 +08:00
lulz1 d15db9012a 同步代码 2024-03-06 09:03:54 +08:00
lulz1 7bcced7715 同步代码 2024-03-06 08:41:41 +08:00
huangxh3 21bad68962 修改 2024-03-06 08:14:53 +08:00
huangxh3 204f016305 Merge remote-tracking branch 'origin/dev' into dev 2024-03-05 19:39:29 +08:00
wanglf3 07be4e5e05 1.同程数据对接设置订单明细 2024-03-05 19:35:22 +08:00
huangxh3 eed29a73f5 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/chint/domain/service/supplier/LYOrderDataAdapter.java
#	src/main/java/com/chint/interfaces/rest/ly/in/FlyBackController.java
#	src/main/java/com/chint/interfaces/rest/ly/in/TrainBackController.java
2024-03-05 19:19:54 +08:00
huangxh3 f6982a7ca8 Merge remote-tracking branch 'origin/dev' into dev 2024-03-05 19:19:12 +08:00
lulz1 a313242361 同步代码 2024-03-05 19:17:57 +08:00
dengwc 0b7d13a2eb 保存差旅与公司映射接口调整 2024-03-05 18:59:56 +08:00
huangxh3 9bda722e2e 修改 2024-03-05 16:15:01 +08:00
lulz1 d51764a6a5 同步代码 2024-03-05 14:41:36 +08:00
lulz1 305671cb50 同步代码 2024-03-05 14:02:07 +08:00
huangxh3 aaae4231eb 火车数据回推 2024-03-05 10:48:27 +08:00
huangxh3 24c0ea081f 火车数据回推 2024-03-05 10:17:06 +08:00
lulz1 0e2a68249f 添加外部删除节点接口 2024-03-05 08:53:53 +08:00
lulz1 a8c963013c 修复bug 2024-03-05 08:36:27 +08:00
lulz1 1e2c40debd Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/chint/infrastructure/repository/LocationRepositoryImpl.java
2024-03-05 08:35:37 +08:00
lulz1 83317c1d43 修复bug 2024-03-05 08:31:40 +08:00
wanglf3 8458c69bf2 1.请求获取携程数据表并保存到数据库 2024-03-05 08:15:46 +08:00
dengwc c99f37c491 同程改签回调接口调整 2024-03-04 17:27:36 +08:00
lulz1 22fb3d7de3 修复bug 2024-03-04 16:21:44 +08:00
lulz1 f806a83c65 修复bug 2024-03-04 16:14:28 +08:00
lulz1 2d1ad02c88 修复bug 2024-03-04 16:02:48 +08:00
lulz1 40f8016568 修复bug 2024-03-04 15:59:57 +08:00
lulz1 f15a4e539a 修复bug 2024-03-04 15:36:59 +08:00
lulz1 58d218fb1f Merge remote-tracking branch 'origin/dev' into dev 2024-03-04 15:35:21 +08:00
lulz1 1006c69517 修复bug 2024-03-04 15:32:31 +08:00
huangxh3 007d914714 Merge remote-tracking branch 'origin/dev' into dev 2024-03-04 15:31:12 +08:00
huangxh3 81aa370130 修改 2024-03-04 15:30:55 +08:00
lulz1 ee3eb7d2bc 修复bug 2024-03-04 15:29:42 +08:00