Commit Graph

402 Commits

Author SHA1 Message Date
moyongzhen
f14bed991f 调整轨迹明细字段赋值 2024-03-06 11:15:41 +08:00
0cf97ffd93 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-06 11:03:41 +08:00
7365a23f63 fix 轨迹查询时区不传默认为+8 2024-03-06 11:03:25 +08:00
moyongzhen
279bfcd1a4 提供接口去掉 轨迹订单和明细 2024-03-06 11:03:13 +08:00
moyongzhen
6d03e3b786 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-06 11:02:17 +08:00
moyongzhen
b337ea937b 轨迹明细查询一个变量写错了 2024-03-06 11:02:10 +08:00
447ea8ae8f fix【S1-更新轨迹成功后,时区没有按照传参来存储】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029832 2024-03-06 10:56:00 +08:00
de42e9e5cf fix 轨迹查询单号去空 2024-03-06 10:48:15 +08:00
c37cf3350f Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-06 10:38:20 +08:00
0b224b8379 fix 轨迹处理循环依赖问题、模板明细对外显示问题 2024-03-06 10:26:07 +08:00
moyongzhen
d9905878ae 轨迹订单分页查询调整 2024-03-06 10:02:05 +08:00
moyongzhen
369eb3708b 轨迹订单明细添加创建人和创建时间 2024-03-06 09:01:32 +08:00
moyongzhen
8f96886eda 轨迹明细订单列表添加子系统id 2024-03-05 21:16:07 +08:00
moyongzhen
80cd00757d Merge branch 'dev' into test 2024-03-05 21:06:00 +08:00
moyongzhen
9d0a52194c Merge branch 'S01-轨迹中台' into dev 2024-03-05 21:05:40 +08:00
moyongzhen
78f6edbbeb 轨迹明细调整 2024-03-05 21:04:30 +08:00
moyongzhen
317d59861a 列表的最新轨迹需要调整 2024-03-05 20:46:00 +08:00
moyongzhen
25e3172275 1 2024-03-05 20:12:39 +08:00
moyongzhen
140ba7465a 轨迹明细调整 2024-03-05 20:11:49 +08:00
moyongzhen
e510d1ce9a Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-05 20:06:18 +08:00
moyongzhen
d76e7c29a1 轨迹明细调整 2024-03-05 20:06:09 +08:00
liuwenxiang
b402c60ae5 Merge pull request '修改' (#53) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/53
2024-03-05 19:13:42 +08:00
柳文翔
3be84b4a40 修改 2024-03-05 19:13:23 +08:00
liuwenxiang
118e383d1e Merge pull request 'S01-轨迹中台' (#52) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/52
2024-03-05 19:02:53 +08:00
liuwenxiang
789fd7d515 Merge pull request '修改' (#51) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/51
2024-03-05 19:02:44 +08:00
柳文翔
5f60f1ee06 修改 2024-03-05 19:01:59 +08:00
5e1e9ac66e Merge branch 'S01-轨迹中台' into test 2024-03-05 17:52:57 +08:00
2b299fb709 fix 订单关联sql 2024-03-05 17:42:34 +08:00
1e5c1bb2a5 Merge branch 'S01-轨迹中台' into test 2024-03-05 17:25:21 +08:00
a4a04bf5a6 fix 订单关联查询sql 2024-03-05 17:25:07 +08:00
0480e75d86 Merge branch 'S01-轨迹中台' into test 2024-03-05 16:58:17 +08:00
327db0fab1 fix【S1-订单关联接口,关联单号不填写,没有给出必填校验提示】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029771 2024-03-05 16:58:00 +08:00
5c0216a013 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-05 16:56:42 +08:00
272e740dac change 创建订单,子系统id从header取 2024-03-05 16:56:18 +08:00
moyongzhen
4f42663ad5 合并解决冲突 2024-03-05 16:55:28 +08:00
moyongzhen
4622906c29 调整轨迹订单明细 2024-03-05 16:53:51 +08:00
799c4a64b2 Merge remote-tracking branch 'origin/test' into test 2024-03-05 16:22:07 +08:00
ac551b7f33 Merge branch 'S01-轨迹中台' into test 2024-03-05 16:21:51 +08:00
9f2667ac6e fix【S1-根据订单号获取轨迹接口-时区不填写,没有默认 +8,按模板顺序查询没有结果】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029746 2024-03-05 16:21:35 +08:00
aac436f61c Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-05 16:12:29 +08:00
moyongzhen
c710dbd599 Merge branch 'dev' into test 2024-03-05 16:09:37 +08:00
moyongzhen
c97336a1dc Merge branch 'S01-轨迹中台' into dev 2024-03-05 16:09:08 +08:00
moyongzhen
8eca00c66b 轨迹明细es查询 2024-03-05 16:08:52 +08:00
0bfc8708be fix 轨迹删除by查询,code未加关键字 2024-03-05 16:01:52 +08:00
fa5668a991 Merge branch 'S01-轨迹中台' into test 2024-03-05 15:13:03 +08:00
48510ad327 Merge branch 'S01-轨迹中台' into dev 2024-03-05 15:07:43 +08:00
362ea52f2e change 修改索引策略 2024-03-05 15:07:08 +08:00
0d209b06e8 Merge remote-tracking branch 'origin/dev' into dev 2024-03-05 14:47:09 +08:00
76304ea2d7 Merge branch 'S01-轨迹中台' into dev 2024-03-05 14:46:49 +08:00
3c14a38578 change 更新轨迹时区 2024-03-05 14:46:26 +08:00