track

ideship/track

Fork 0

Commit Graph

Select branches

Hide Pull Requests

master

test

#1

#2

#3

#4

#5

#6

#7

#8

#9

c37cf3350f Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台李鹏军 2024-03-06 10:38:20 +0800
0b224b8379 fix 轨迹处理循环依赖问题、模板明细对外显示问题李鹏军 2024-03-06 10:26:07 +0800
d9905878ae 轨迹订单分页查询调整 moyongzhen 2024-03-06 10:02:05 +0800
369eb3708b 轨迹订单明细添加创建人和创建时间 moyongzhen 2024-03-06 09:01:32 +0800
8f96886eda 轨迹明细订单列表添加子系统id moyongzhen 2024-03-05 21:16:07 +0800
80cd00757d Merge branch 'dev' into test moyongzhen 2024-03-05 21:06:00 +0800
9d0a52194c Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-05 21:05:40 +0800
78f6edbbeb 轨迹明细调整 moyongzhen 2024-03-05 21:04:30 +0800
317d59861a 列表的最新轨迹需要调整 moyongzhen 2024-03-05 20:46:00 +0800
25e3172275 1 moyongzhen 2024-03-05 20:12:39 +0800
140ba7465a 轨迹明细调整 moyongzhen 2024-03-05 20:11:49 +0800
e510d1ce9a Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 moyongzhen 2024-03-05 20:06:18 +0800
d76e7c29a1 轨迹明细调整 moyongzhen 2024-03-05 20:06:09 +0800
b402c60ae5 Merge pull request '修改' (#53) from S01-轨迹中台 into test liuwenxiang 2024-03-05 19:13:42 +0800
3be84b4a40 修改柳文翔 2024-03-05 19:13:23 +0800
118e383d1e Merge pull request 'S01-轨迹中台' (#52) from S01-轨迹中台 into dev liuwenxiang 2024-03-05 19:02:53 +0800
789fd7d515 Merge pull request '修改' (#51) from S01-轨迹中台 into test liuwenxiang 2024-03-05 19:02:44 +0800
5f60f1ee06 修改柳文翔 2024-03-05 19:01:59 +0800
5e1e9ac66e Merge branch 'S01-轨迹中台' into test 李鹏军 2024-03-05 17:52:57 +0800
2b299fb709 fix 订单关联sql 李鹏军 2024-03-05 17:42:34 +0800
1e5c1bb2a5 Merge branch 'S01-轨迹中台' into test 李鹏军 2024-03-05 17:25:21 +0800
a4a04bf5a6 fix 订单关联查询sql 李鹏军 2024-03-05 17:25:07 +0800
0480e75d86 Merge branch 'S01-轨迹中台' into test 李鹏军 2024-03-05 16:58:17 +0800
327db0fab1 fix【S1-订单关联接口，关联单号不填写，没有给出必填校验提示】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029771 李鹏军 2024-03-05 16:58:00 +0800
5c0216a013 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台李鹏军 2024-03-05 16:56:42 +0800
272e740dac change 创建订单，子系统id从header取李鹏军 2024-03-05 16:56:18 +0800
4f42663ad5 合并解决冲突 moyongzhen 2024-03-05 16:55:28 +0800
4622906c29 调整轨迹订单明细 moyongzhen 2024-03-05 16:53:51 +0800
799c4a64b2 Merge remote-tracking branch 'origin/test' into test 李鹏军 2024-03-05 16:22:07 +0800
ac551b7f33 Merge branch 'S01-轨迹中台' into test 李鹏军 2024-03-05 16:21:51 +0800
9f2667ac6e fix【S1-根据订单号获取轨迹接口-时区不填写，没有默认 +8，按模板顺序查询没有结果】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029746 李鹏军 2024-03-05 16:21:19 +0800
aac436f61c Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台李鹏军 2024-03-05 16:12:29 +0800
c710dbd599 Merge branch 'dev' into test moyongzhen 2024-03-05 16:09:37 +0800
c97336a1dc Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-05 16:09:08 +0800
8eca00c66b 轨迹明细es查询 moyongzhen 2024-03-05 16:08:52 +0800
0bfc8708be fix 轨迹删除by查询，code未加关键字李鹏军 2024-03-05 16:01:52 +0800
fa5668a991 Merge branch 'S01-轨迹中台' into test 李鹏军 2024-03-05 15:13:03 +0800
48510ad327 Merge branch 'S01-轨迹中台' into dev 李鹏军 2024-03-05 15:07:43 +0800
362ea52f2e change 修改索引策略李鹏军 2024-03-05 15:07:08 +0800
0d209b06e8 Merge remote-tracking branch 'origin/dev' into dev 李鹏军 2024-03-05 14:47:09 +0800
76304ea2d7 Merge branch 'S01-轨迹中台' into dev 李鹏军 2024-03-05 14:46:49 +0800
3c14a38578 change 更新轨迹时区李鹏军 2024-03-05 14:46:26 +0800
89573fc97b Merge remote-tracking branch 'origin/test' into test 李鹏军 2024-03-05 11:50:00 +0800
8b570a7462 Merge branch 'S01-轨迹中台' into test 李鹏军 2024-03-05 11:49:39 +0800
c2e06e1201 fix【S1-调新增轨迹订单接口，新增成功了一个相同单号且订单类型为空的订单】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029721 李鹏军 2024-03-05 11:49:16 +0800
8f2d9cf708 fix【S1-创建轨迹订单时，目的国家、目的城市、起运国家、起运城市这4个字段都是必填的，但是不填写时，都可以创建成功】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029724 李鹏军 2024-03-05 11:43:15 +0800
86ae365a81 fix【S1-新增订单轨迹接口，按照文档，轨迹发生时间和时区都是必填，但是实际不填写也新增成功了】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029729 李鹏军 2024-03-05 11:39:44 +0800
f62cb2cf56 attach 李鹏军 2024-03-05 11:36:56 +0800
6d1ee3a313 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台李鹏军 2024-03-05 11:34:47 +0800
415360ef8d change 航班、模板可传null 李鹏军 2024-03-05 11:34:29 +0800
53c1aa8cf8 Merge pull request '修改' (#50) from S01-轨迹中台 into dev liuwenxiang 2024-03-05 11:19:29 +0800
4701a9f834 Merge pull request '修改' (#49) from S01-轨迹中台 into test liuwenxiang 2024-03-05 11:19:15 +0800
d21c832439 修改柳文翔 2024-03-05 11:18:49 +0800
f28beab241 Merge pull request '修改问题和提示语' (#48) from S01-轨迹中台 into test liuwenxiang 2024-03-05 10:50:32 +0800
811c524ab0 Merge pull request '修改问题和提示语' (#47) from S01-轨迹中台 into dev liuwenxiang 2024-03-05 10:50:24 +0800
9d8cdadc9c 修改问题和提示语柳文翔 2024-03-05 10:50:07 +0800
d6be85d049 Merge branch 'S01-轨迹中台' into test 李鹏军 2024-03-04 18:52:28 +0800
e7b80fb1fd change 添加提供接口路由前缀李鹏军 2024-03-04 18:51:56 +0800
e055bedaf1 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台李鹏军 2024-03-04 18:48:59 +0800
22dd02507f test 轨迹查询、新增、修改、软删除李鹏军 2024-03-04 18:48:43 +0800
588740f54f Merge branch 'S01-轨迹中台' into test dingenwen 2024-03-04 18:31:47 +0800
23bdae7520 Merge branch 'test' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into test dingenwen 2024-03-04 18:31:24 +0800
999c7d77ba 配置多语言 dingenwen 2024-03-04 18:23:47 +0800
9ba8266480 轨迹模版分页查询添加参数子系统id moyongzhen 2024-03-04 18:05:41 +0800
c2e3a4d26e Merge branch 'test' into S01-轨迹中台 moyongzhen 2024-03-04 16:43:36 +0800
cc325aa496 轨迹内容调整 moyongzhen 2024-03-04 16:42:52 +0800
b6e0abc03f Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台李鹏军 2024-03-04 15:32:01 +0800
4f72a4405c add 删除轨迹李鹏军 2024-03-04 15:30:57 +0800
02af7bc45e Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台柳文翔 2024-03-04 15:25:22 +0800
c9772299a5 修改提示语柳文翔 2024-03-04 15:25:20 +0800
2177f0741f Merge branch 'S01-轨迹中台' into test moyongzhen 2024-03-04 15:13:31 +0800
dc723def0b Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev moyongzhen 2024-03-04 15:10:03 +0800
d3dea7dd9e 提示语优化 moyongzhen 2024-03-04 15:09:53 +0800
1f3e1098f0 Merge pull request 'S01-轨迹中台' (#46) from S01-轨迹中台 into dev liuwenxiang 2024-03-04 15:05:48 +0800
fe55e08c54 Merge pull request 'S01-轨迹中台' (#45) from S01-轨迹中台 into test liuwenxiang 2024-03-04 15:05:24 +0800
5d5c7843b7 修复错误柳文翔 2024-03-04 15:05:03 +0800
8e5ffc0652 还原代码柳文翔 2024-03-04 14:51:22 +0800
b1473cb07c Merge branch 'S01-轨迹中台' into test dingenwen 2024-03-04 14:42:06 +0800
0d7b743beb Merge branch 'S01-轨迹中台' into dev 李鹏军 2024-03-04 14:07:50 +0800
3c6008a2b5 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台李鹏军 2024-03-04 12:00:25 +0800
4b46eb92bd 推拉做不了，临时提交李鹏军 2024-03-04 12:00:09 +0800
764eb29168 Merge pull request '修改缓存' (#44) from S01-轨迹中台 into test liuwenxiang 2024-03-04 11:43:58 +0800
1a8158e6e0 Merge pull request '修改缓存' (#43) from S01-轨迹中台 into dev liuwenxiang 2024-03-04 11:43:49 +0800
3298d3cb88 修改缓存柳文翔 2024-03-04 11:43:29 +0800
b7778dc2d0 Merge branch 'S01-轨迹中台' into test dingenwen 2024-03-04 10:41:44 +0800
d9a52413de Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-04 10:33:17 +0800
1b79aba439 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 moyongzhen 2024-03-04 10:31:58 +0800
8e91589186 轨迹标记添加是否完结字段 moyongzhen 2024-03-04 10:31:49 +0800
f54064c7b4 Merge pull request 'S01-轨迹中台' (#42) from S01-轨迹中台 into dev liuwenxiang 2024-03-04 10:20:32 +0800
d3edc93afd Merge pull request 'S01-轨迹中台' (#41) from S01-轨迹中台 into test liuwenxiang 2024-03-04 10:20:21 +0800
28462ffc83 修改柳文翔 2024-03-04 10:20:02 +0800
2905b47d1a 轨迹标记删除提示语 moyongzhen 2024-03-04 09:26:59 +0800
92e7d87528 Merge branch 'test' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into test 柳文翔 2024-03-02 18:03:27 +0800
6a5db2f2f9 Merge branch 'S01-轨迹中台' into test 柳文翔 2024-03-02 18:03:24 +0800
4336becb5f Merge pull request '修改' (#40) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 18:02:45 +0800
be01780d28 Merge pull request '修改' (#39) from S01-轨迹中台 into test liuwenxiang 2024-03-02 18:02:26 +0800
51fe08f607 修改柳文翔 2024-03-02 18:02:06 +0800
d852b804bb Merge pull request '分页' (#38) from S01-轨迹中台 into test liuwenxiang 2024-03-02 16:59:20 +0800
b629aa6eaf Merge pull request '分页' (#37) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 16:59:12 +0800
131bf85708 分页柳文翔 2024-03-02 16:58:58 +0800

Commit Graph Select branches Hide Pull Requests master test #1 #2 #3 #4 #5 #6 #7 #8 #9 Mono Color

Commit Graph

Select branches

Hide Pull Requests

master

test

#1

#2

#3

#4

#5

#6

#7

#8

#9