ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
942 Commits 2 Branches 0 Tags 4.7 MiB
fae534a256
Commit Graph

942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
李鹏军
ccdc43674c Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 
# Conflicts:
#	src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs
 2024-03-15 16:54:43 +08:00
李鹏军
f8d5705551 临时提交 2024-03-15 16:52:36 +08:00
柳文翔
3871b31af0 删除无用引用 2024-03-15 16:13:47 +08:00
柳文翔
06e43db12c 补充 2024-03-15 16:12:55 +08:00
柳文翔
eb1a3480f0 Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 16:09:28 +08:00
柳文翔
1d80a8de4e 添加推送配置缓存 2024-03-15 16:09:27 +08:00
李鹏军
7fedecd37c Merge branch 'S02-轨迹中台' into test 
# Conflicts:
#	src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
 2024-03-15 16:04:00 +08:00
moyongzhen
68abebe60a Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 15:33:34 +08:00
moyongzhen
35bb8e13e0 轨迹订单明细补充s01遗漏代码 2024-03-15 15:33:27 +08:00
李鹏军
91ad7eebb8 临时提交 2024-03-15 14:49:09 +08:00
李鹏军
12c439c832 Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-15 09:53:44 +08:00
李鹏军
f50dccebe8 临时提交 2024-03-15 09:53:24 +08:00
柳文翔
786f1f0d25 添加拉取配置缓存 2024-03-14 14:07:09 +08:00
李鹏军
8f0f40cc56 定时任务 2024-03-14 11:49:24 +08:00
李鹏军
a9b13a3c31 Merge remote-tracking branch 'origin/test' into test 2024-03-14 10:10:50 +08:00
李鹏军
850ff601dd Merge branch 'S02-轨迹中台' into test 2024-03-14 10:10:33 +08:00
李鹏军
92bf6f549f 调试轨迹刷新 2024-03-14 10:10:04 +08:00
柳文翔
6a6e46482a 修改拉取缓存设置 2024-03-14 09:21:22 +08:00
dingenwen
e2d433da70 Merge branch 'S02-轨迹中台' into test 2024-03-13 19:33:31 +08:00
dingenwen
1718ede2ee 修复异常 2024-03-13 19:33:04 +08:00
dingenwen
d01506e4e8 Merge branch 'S02-轨迹中台' into test 2024-03-13 17:53:59 +08:00
moyongzhen
275571f003 Merge branch 'S02-轨迹中台' into dev 2024-03-13 17:45:49 +08:00
moyongzhen
c74b331511 调整 2024-03-13 17:44:54 +08:00
moyongzhen
82ffaaccdb Merge branch 'S02-轨迹中台' into dev 2024-03-13 17:42:40 +08:00
moyongzhen
9bd030465b 轨迹明细添加订单类型id和订单号 2024-03-13 17:41:57 +08:00
柳文翔
c0b5db3ab5 修改错误语句 2024-03-13 17:16:15 +08:00
李鹏军
210e5e51cf Merge remote-tracking branch 'origin/test' into test 2024-03-13 15:43:40 +08:00
李鹏军
6a911177f7 add 校验订单至少有一个模板 2024-03-13 15:41:59 +08:00
dingenwen
4e96eab54b 处理异常 2024-03-13 10:54:45 +08:00
dingenwen
5ebe58d8b3 解决冲突 2024-03-13 10:53:24 +08:00
李鹏军
be086de68f Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-13 10:40:19 +08:00
moyongzhen
4e4dbbeb5f 解决冲突 2024-03-13 10:20:26 +08:00
moyongzhen
678c631f77 解决冲突 2024-03-13 10:20:03 +08:00
moyongzhen
953bca93f5 轨迹订单参数提交 2024-03-13 10:16:27 +08:00
李鹏军
f19ba6c01a add 删除引发轨迹更新 2024-03-13 10:08:41 +08:00
moyongzhen
aafb73e232 合并解决冲突 2024-03-13 09:38:49 +08:00
moyongzhen
6bea8224f0 订单参数调整 2024-03-13 09:34:42 +08:00
moyongzhen
490f2cde03 Merge branch 'S02-轨迹中台' into dev 2024-03-12 21:24:00 +08:00
moyongzhen
10a68b817a 重新解决报错 2024-03-12 21:23:47 +08:00
moyongzhen
bfd9f3afd3 解决冲突 2024-03-12 21:16:57 +08:00
moyongzhen
d23edffffc 轨迹订单添加问题类型字段和问题描述返参 2024-03-12 21:13:20 +08:00
李鹏军
2e86b7f7ba change【更新轨迹需要更新订单的最新轨迹信息】https://www.tapd.cn/60863849/prong/tasks/view/1160863849001016391 2024-03-12 17:28:15 +08:00
李鹏军
8fb4bd7fbf Merge remote-tracking branch 'origin/dev' into dev 2024-03-12 16:01:30 +08:00
李鹏军
d1b7e89173 Merge branch 'S02-轨迹中台' into dev 2024-03-12 16:00:18 +08:00
李鹏军
767cbcc319 Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-12 16:00:01 +08:00
李鹏军
f4b7645ddf 支持批量新增、更新轨迹 2024-03-12 15:59:34 +08:00
dingenwen
6e4bb58ab6 Merge branch 'S02-轨迹中台' into test 2024-03-12 14:44:55 +08:00
moyongzhen
8f85672625 订单查询条件增加 订单类型,客户 的过滤条件 2024-03-12 14:44:29 +08:00
dingenwen
e332ae31d9 Merge branch 'S02-轨迹中台' into test 2024-03-12 14:43:06 +08:00
liuwenxiang
9eada6b6a0 Merge pull request '拉取 推送 列表返回子系统id' (#61) from S02-轨迹中台 into dev 
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/61
 2024-03-12 10:49:19 +08:00