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 |
|
|
|
89573fc97b
|
Merge remote-tracking branch 'origin/test' into test
|
2024-03-05 11:50:00 +08:00 |
|
|
|
8b570a7462
|
Merge branch 'S01-轨迹中台' into test
|
2024-03-05 11:49:39 +08:00 |
|
|
|
c2e06e1201
|
fix【S1-调新增轨迹订单接口,新增成功了一个相同单号且订单类型为空的订单】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029721
|
2024-03-05 11:49:16 +08:00 |
|
|
|
8f2d9cf708
|
fix【S1-创建轨迹订单时,目的国家、目的城市、起运国家、起运城市这4个字段都是必填的,但是不填写时,都可以创建成功】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029724
|
2024-03-05 11:43:15 +08:00 |
|
|
|
86ae365a81
|
fix【S1-新增订单轨迹接口,按照文档,轨迹发生时间和时区都是必填,但是实际不填写也新增成功了】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029729
|
2024-03-05 11:39:44 +08:00 |
|
|
|
f62cb2cf56
|
attach
|
2024-03-05 11:36:56 +08:00 |
|
|
|
6d1ee3a313
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-05 11:34:47 +08:00 |
|
|
|
415360ef8d
|
change 航班、模板 可传null
|
2024-03-05 11:34:29 +08:00 |
|
liuwenxiang
|
53c1aa8cf8
|
Merge pull request '修改' (#50) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/50
|
2024-03-05 11:19:29 +08:00 |
|
liuwenxiang
|
4701a9f834
|
Merge pull request '修改' (#49) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/49
|
2024-03-05 11:19:15 +08:00 |
|
柳文翔
|
d21c832439
|
修改
|
2024-03-05 11:18:49 +08:00 |
|
liuwenxiang
|
f28beab241
|
Merge pull request '修改问题和提示语' (#48) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/48
|
2024-03-05 10:50:32 +08:00 |
|
liuwenxiang
|
811c524ab0
|
Merge pull request '修改问题和提示语' (#47) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/47
|
2024-03-05 10:50:24 +08:00 |
|
柳文翔
|
9d8cdadc9c
|
修改问题和提示语
|
2024-03-05 10:50:07 +08:00 |
|
|
|
d6be85d049
|
Merge branch 'S01-轨迹中台' into test
|
2024-03-04 18:52:28 +08:00 |
|
|
|
e7b80fb1fd
|
change 添加提供接口路由前缀
|
2024-03-04 18:51:56 +08:00 |
|
|
|
e055bedaf1
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-04 18:48:59 +08:00 |
|
|
|
22dd02507f
|
test 轨迹查询、新增、修改、软删除
|
2024-03-04 18:48:43 +08:00 |
|
dingenwen
|
588740f54f
|
Merge branch 'S01-轨迹中台' into test
|
2024-03-04 18:31:47 +08:00 |
|
dingenwen
|
23bdae7520
|
Merge branch 'test' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into test
|
2024-03-04 18:31:24 +08:00 |
|
dingenwen
|
999c7d77ba
|
配置多语言
|
2024-03-04 18:23:47 +08:00 |
|
moyongzhen
|
9ba8266480
|
轨迹模版分页查询添加参数子系统id
|
2024-03-04 18:05:41 +08:00 |
|
moyongzhen
|
c2e3a4d26e
|
Merge branch 'test' into S01-轨迹中台
|
2024-03-04 16:43:36 +08:00 |
|
moyongzhen
|
cc325aa496
|
轨迹内容调整
|
2024-03-04 16:42:52 +08:00 |
|