Commit Graph

348 Commits

Author SHA1 Message Date
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
b6e0abc03f Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-04 15:32:01 +08:00
4f72a4405c add 删除轨迹 2024-03-04 15:30:57 +08:00
柳文翔
02af7bc45e Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-04 15:25:22 +08:00
柳文翔
c9772299a5 修改提示语 2024-03-04 15:25:20 +08:00
moyongzhen
2177f0741f Merge branch 'S01-轨迹中台' into test 2024-03-04 15:13:31 +08:00
moyongzhen
dc723def0b Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev 2024-03-04 15:10:03 +08:00
moyongzhen
d3dea7dd9e 提示语优化 2024-03-04 15:09:53 +08:00
liuwenxiang
1f3e1098f0 Merge pull request 'S01-轨迹中台' (#46) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/46
2024-03-04 15:05:48 +08:00
liuwenxiang
fe55e08c54 Merge pull request 'S01-轨迹中台' (#45) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/45
2024-03-04 15:05:24 +08:00
柳文翔
5d5c7843b7 修复错误 2024-03-04 15:05:03 +08:00
柳文翔
8e5ffc0652 还原代码 2024-03-04 14:51:22 +08:00
dingenwen
b1473cb07c Merge branch 'S01-轨迹中台' into test 2024-03-04 14:42:06 +08:00
0d7b743beb Merge branch 'S01-轨迹中台' into dev 2024-03-04 14:07:50 +08:00
3c6008a2b5 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-04 12:00:25 +08:00
4b46eb92bd 推拉做不了,临时提交 2024-03-04 12:00:09 +08:00
liuwenxiang
764eb29168 Merge pull request '修改缓存' (#44) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/44
2024-03-04 11:43:58 +08:00
liuwenxiang
1a8158e6e0 Merge pull request '修改缓存' (#43) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/43
2024-03-04 11:43:49 +08:00
柳文翔
3298d3cb88 修改缓存 2024-03-04 11:43:29 +08:00
dingenwen
b7778dc2d0 Merge branch 'S01-轨迹中台' into test 2024-03-04 10:41:44 +08:00
moyongzhen
d9a52413de Merge branch 'S01-轨迹中台' into dev 2024-03-04 10:33:17 +08:00
moyongzhen
1b79aba439 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-04 10:31:58 +08:00
moyongzhen
8e91589186 轨迹标记添加是否完结字段 2024-03-04 10:31:49 +08:00
liuwenxiang
f54064c7b4 Merge pull request 'S01-轨迹中台' (#42) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/42
2024-03-04 10:20:32 +08:00
liuwenxiang
d3edc93afd Merge pull request 'S01-轨迹中台' (#41) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/41
2024-03-04 10:20:21 +08:00
柳文翔
28462ffc83 修改 2024-03-04 10:20:02 +08:00
moyongzhen
2905b47d1a 轨迹标记删除提示语 2024-03-04 09:26:59 +08:00
柳文翔
92e7d87528 Merge branch 'test' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into test 2024-03-02 18:03:27 +08:00
柳文翔
6a5db2f2f9 Merge branch 'S01-轨迹中台' into test 2024-03-02 18:03:24 +08:00
liuwenxiang
4336becb5f Merge pull request '修改' (#40) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/40
2024-03-02 18:02:45 +08:00
liuwenxiang
be01780d28 Merge pull request '修改' (#39) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/39
2024-03-02 18:02:26 +08:00