Commit Graph

406 Commits

Author SHA1 Message Date
moyongzhen
678c631f77 解决冲突 2024-03-13 10:20:03 +08:00
moyongzhen
953bca93f5 轨迹订单参数提交 2024-03-13 10:16:27 +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
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
柳文翔
ff32e003f4 拉取 推送 列表返回子系统id 2024-03-12 10:49:04 +08:00
liuwenxiang
215a035d90 Merge pull request '添加轨迹拉取内容入参校验' (#60) from S02-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/60
2024-03-12 10:19:18 +08:00
柳文翔
b1441abf26 添加轨迹拉取内容入参校验 2024-03-12 10:19:02 +08:00
liuwenxiang
9fbd2d645c Merge pull request '修改错误' (#59) from S02-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/59
2024-03-12 10:11:31 +08:00
柳文翔
2ce73fd57b 修改错误 2024-03-12 10:11:17 +08:00
liuwenxiang
8e41e83595 Merge pull request '补充提交' (#58) from S02-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/58
2024-03-12 09:54:39 +08:00
柳文翔
2d7e1fb609 补充提交 2024-03-12 09:54:06 +08:00
liuwenxiang
95a4d0494d Merge pull request '解决swagger字段注释问题' (#57) from S02-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/57
2024-03-12 09:51:53 +08:00
柳文翔
dd92ea9102 解决swagger字段注释问题 2024-03-12 09:51:22 +08:00
moyongzhen
7506981544 Merge branch 'S01-轨迹中台' into dev 2024-03-12 09:45:18 +08:00
moyongzhen
7949fd1dfa 订单查询条件增加 订单类型,客户 的过滤条件 2024-03-12 09:43:19 +08:00
d88313ae53 Merge remote-tracking branch 'origin/dev' into dev 2024-03-11 15:48:16 +08:00
ba78ba46ae change 整合轨迹服务、订单服务 2024-03-11 10:19:06 +08:00
柳文翔
be45223b94 Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-11 09:46:18 +08:00
柳文翔
edf9704ffe 修改参数表字段;添加拉去配置缓存 2024-03-11 09:46:17 +08:00
88aba1edb8 add【轨迹中心对外接口提供--新增轨迹/更新轨迹订单】https://www.tapd.cn/60863849/prong/tasks/view/1160863849001016386 2024-03-11 09:10:03 +08:00
9ae2a8335a 轨迹刷新初步完成 2024-03-09 18:08:42 +08:00
柳文翔
3baf9aea8b 获取服务商拉取配置添加子系统入参 2024-03-09 17:31:21 +08:00
e17eb425a4 临时提交 2024-03-09 16:15:04 +08:00
柳文翔
0e8af92756 修改字段 2024-03-09 15:16:32 +08:00
柳文翔
4d2850077b 修改轨迹拉取配置 2024-03-09 10:28:27 +08:00
柳文翔
dd1a653d26 参数表添加字段 2024-03-09 10:20:49 +08:00
76fcd29ca7 add 关联补轨迹,add 批量删除轨迹 2024-03-08 18:45:34 +08:00
liuwenxiang
1c720a8ead Merge pull request 'S02-轨迹中台' (#56) from S02-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/56
2024-03-08 09:52:47 +08:00
柳文翔
2e0a1f3e4d 轨迹映射修改 2024-03-08 09:50:02 +08:00
moyongzhen
350ba56a45 调整 2024-03-06 20:11:54 +08:00
moyongzhen
ff14cb5d32 参数调整 2024-03-06 20:05:05 +08:00
dingenwen
8ab49cd4ff Merge pull request 'S01-轨迹中台' (#54) from S01-轨迹中台 into uat
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/54
2024-03-06 20:02:54 +08:00
moyongzhen
62c43ab146 轨迹明细是否删除和对外的调整 2024-03-06 19:48:43 +08:00
moyongzhen
7836a78be6 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-06 17:44:37 +08:00
moyongzhen
cd60b420ac 轨迹明细调整 2024-03-06 17:44:26 +08:00
7f43cbfe66 attach 2024-03-06 15:31:50 +08:00
769fb8b66a change 轨迹删除逻辑 2024-03-06 15:18:08 +08:00
8922d98ba4 fix 轨迹可删过滤 2024-03-06 14:51:41 +08:00
e2a34ede15 attach 2024-03-06 14:21:30 +08:00
a127285d18 add cap消费失败预警 2024-03-06 11:47:48 +08:00