Commit Graph

1400 Commits

Author SHA1 Message Date
367211f755 添加原轨迹信息 2024-03-21 09:25:11 +08:00
786679a4b7 Merge remote-tracking branch 'origin/dev' into dev 2024-03-20 18:36:52 +08:00
2fbbb251ab Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-20 18:36:28 +08:00
0cb30b3d4b fix upsert 2024-03-20 18:36:12 +08:00
liuwenxiang
3070193228 Merge pull request 'S02-轨迹中台第二部分' (#63) from S02-轨迹中台第二部分 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/63
2024-03-20 17:45:11 +08:00
柳文翔
39dc2f52f2 Merge branch 'S02-轨迹中台第二部分' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台第二部分 2024-03-20 17:27:00 +08:00
柳文翔
07572a5838 修改推送缓存返回值 2024-03-20 17:26:59 +08:00
038c495dfa fix 推送配置可能是空 2024-03-20 17:23:08 +08:00
f40f23fc43 Merge remote-tracking branch 'origin/dev' into dev 2024-03-20 15:57:13 +08:00
b7c4256e52 解决冲突 2024-03-20 15:56:56 +08:00
2bfbf3c3a5 Merge branch 'S02-轨迹中台第二部分' into dev
# Conflicts:
#	src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
#	src/SJZY.Track.Repository/Repositories/OrderRepository.cs
2024-03-20 15:49:30 +08:00
c4917d66cc fix 循环依赖异常case 2024-03-19 15:51:15 +08:00
095d5d6501 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-19 15:27:14 +08:00
a13ee83d00 删除引发的更新delay3s 2024-03-19 15:26:51 +08:00
0d3581a6e1 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-19 14:59:40 +08:00
464ca232f2 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into S02-轨迹中台第二部分 2024-03-19 14:59:10 +08:00
8f1da65c5a 测试 2024-03-19 14:58:53 +08:00
moyongzhen
02aa293e80 Merge branch 'S02-轨迹中台第二部分' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台第二部分 2024-03-19 14:52:17 +08:00
moyongzhen
55d7115b38 可能警告 2024-03-19 14:52:09 +08:00
7629fd8585 Merge remote-tracking branch 'origin/test' into test 2024-03-19 14:40:34 +08:00
915eb88f03 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-19 14:40:11 +08:00
9cca8dedc4 分组 2024-03-19 14:39:09 +08:00
d3a4f81c65 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into S02-轨迹中台第二部分 2024-03-19 14:36:15 +08:00
b17f01b157 调整轨迹变更导致订单更新逻辑 2024-03-19 14:35:34 +08:00
moyongzhen
0345c4a294 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-18 18:16:35 +08:00
moyongzhen
772af102c7 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-18 18:15:03 +08:00
moyongzhen
e71535f844 获取轨迹计数器、获取轨迹推送记录添加请求的方法名 2024-03-18 18:14:51 +08:00
moyongzhen
d336c90e62 解决冲突 2024-03-18 18:04:48 +08:00
ff641362c9 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-18 17:39:33 +08:00
6cc32ffbad 调整推送索引字段 2024-03-18 17:30:21 +08:00
moyongzhen
21c6422f23 补充 2024-03-18 17:20:00 +08:00
moyongzhen
757f60e5e8 提交代码 2024-03-18 17:08:28 +08:00
36706ae62c 临时提交 2024-03-18 16:15:01 +08:00
f189cb1a63 临时提交 2024-03-18 15:40:50 +08:00
80e6cc0c53 初步完成轨迹推送 2024-03-18 14:39:09 +08:00
f39cd3421c init 2024-03-18 09:44:42 +08:00
dingenwen
8056603a1d Merge pull request 'S02-轨迹中台' (#62) from S02-轨迹中台 into uat
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/62
2024-03-16 15:12:08 +08:00
980774fd9f Merge branch 'S02-轨迹中台' into test 2024-03-16 14:27:56 +08:00
df509216b3 attach 2024-03-16 14:27:43 +08:00
4677f69e2a Merge branch 'S02-轨迹中台' into test 2024-03-16 14:23:17 +08:00
51b529ae90 对接接口通7.1.6 2024-03-16 14:23:01 +08:00
26b3483c36 Merge branch 'S02-轨迹中台' into test 2024-03-16 11:33:14 +08:00
8d186fa985 opt提示 2024-03-16 11:32:02 +08:00
d1f5c7e682 Merge branch 'S02-轨迹中台' into test 2024-03-16 10:40:33 +08:00
7e0911fd51 fix【【轨迹订单】轨迹明细删除后,列表下发的数据仍显示轨迹明细信息】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001030812 2024-03-16 10:40:22 +08:00
95a63ca8ca Merge branch 'S02-轨迹中台' into test 2024-03-16 10:30:21 +08:00
d819dfe6d8 临时提交 2024-03-16 10:29:04 +08:00
888f601e4e Merge branch 'S02-轨迹中台' into test 2024-03-15 17:51:09 +08:00
柳文翔
c30542024c Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 17:50:31 +08:00
柳文翔
18f065fbf1 修改 2024-03-15 17:50:29 +08:00