Commit Graph

1734 Commits

Author SHA1 Message Date
liuwenxiang
9f37243296 Merge pull request 'S01-轨迹中台' (#32) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/32
2024-03-02 15:54:34 +08:00
柳文翔
f0bf725e79 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 15:54:16 +08:00
柳文翔
570ffbbdf1 1 2024-03-02 15:54:15 +08:00
moyongzhen
078e2fd448 Merge branch 'S01-轨迹中台' into dev 2024-03-02 15:53:21 +08:00
moyongzhen
8fc907d025 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 15:52:22 +08:00
moyongzhen
6da3e0748c 轨迹内容删除校验 2024-03-02 15:52:12 +08:00
8b4219a8ad Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
# Conflicts:
#	src/SJZY.Track.Domain/GlobalConst.cs
2024-03-02 15:35:54 +08:00
5fa20966ab 轨迹发生 2024-03-02 15:34:26 +08:00
liuwenxiang
0c1fe3cbde Merge pull request '修改' (#31) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/31
2024-03-02 15:30:04 +08:00
liuwenxiang
d6ec50cbc8 Merge pull request '修改' (#30) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/30
2024-03-02 15:29:39 +08:00
柳文翔
04733815d5 修改 2024-03-02 15:29:08 +08:00
liuwenxiang
bb2f0f650c Merge pull request 'S01-轨迹中台' (#29) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/29
2024-03-02 15:08:24 +08:00
liuwenxiang
d74e8d3d46 Merge pull request 'S01-轨迹中台' (#28) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/28
2024-03-02 15:08:15 +08:00
柳文翔
2d7ed5d2a5 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 15:07:51 +08:00
柳文翔
3e908cb7ef 修改字段 2024-03-02 15:07:49 +08:00
dingenwen
d518bdfa64 Merge branch 'S01-轨迹中台' into test 2024-03-02 14:53:19 +08:00
moyongzhen
92ee6be804 Merge branch 'S01-轨迹中台' into dev 2024-03-02 14:49:23 +08:00
moyongzhen
f48cd3d146 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 14:47:36 +08:00
moyongzhen
af49cb7bda 删除轨迹内容提示语 2024-03-02 14:47:28 +08:00
liuwenxiang
ce6e637a6b Merge pull request '修改提示语' (#27) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/27
2024-03-02 14:46:54 +08:00
liuwenxiang
48bb84a2fd Merge pull request '修改提示语' (#26) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/26
2024-03-02 14:46:40 +08:00
柳文翔
a2e5580070 修改提示语 2024-03-02 14:46:16 +08:00
liuwenxiang
383d12fbbd Merge pull request 'S01-轨迹中台' (#25) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/25
2024-03-02 14:41:54 +08:00
liuwenxiang
6503122709 Merge pull request 'S01-轨迹中台' (#24) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/24
2024-03-02 14:41:40 +08:00
柳文翔
35ce79fd99 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 14:41:17 +08:00
柳文翔
904b44e262 入参校验 2024-03-02 14:41:15 +08:00
moyongzhen
19a0f93841 Merge branch 'S01-轨迹中台' into dev 2024-03-02 14:21:13 +08:00
moyongzhen
b8357b33d7 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 14:20:31 +08:00
moyongzhen
b95ca01d62 轨迹订单查询 字符串数组改成字符串 2024-03-02 14:20:23 +08:00
liuwenxiang
3c1d9014de Merge pull request '补充提交' (#23) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/23
2024-03-02 13:54:37 +08:00
柳文翔
046999c208 补充提交 2024-03-02 13:54:26 +08:00
liuwenxiang
47060c81d4 Merge pull request '修改' (#22) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/22
2024-03-02 13:53:14 +08:00
柳文翔
bed691aa71 修改 2024-03-02 13:52:51 +08:00
liuwenxiang
cdcce93aaa Merge pull request '去重' (#21) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/21
2024-03-02 13:01:54 +08:00
柳文翔
fefc52638a 去重 2024-03-02 13:01:35 +08:00
liuwenxiang
7342070d5a Merge pull request '字段修改' (#20) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/20
2024-03-02 12:47:36 +08:00
柳文翔
884a802481 字段修改 2024-03-02 12:47:20 +08:00
liuwenxiang
4813d880a9 Merge pull request 'S01-轨迹中台' (#19) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/19
2024-03-02 12:43:44 +08:00
柳文翔
91a99ad66e Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 12:42:49 +08:00
柳文翔
b21b6402e9 修改 2024-03-02 12:42:48 +08:00
moyongzhen
e7f7eecbe0 Merge branch 'S01-轨迹中台' into dev 2024-03-02 12:16:36 +08:00
moyongzhen
cbdba985c2 验证 轨迹订单 页面 列表数据 显示是否正确-列表数据按创建时间倒序显示 2024-03-02 12:07:11 +08:00
liuwenxiang
59a5818be5 Merge pull request 'S01-轨迹中台' (#18) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/18
2024-03-02 11:52:20 +08:00
柳文翔
a9d7ab72b2 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 11:52:11 +08:00
柳文翔
d0e25fe708 修改错误 2024-03-02 11:52:09 +08:00
moyongzhen
a47465758f Merge branch 'S01-轨迹中台' into dev 2024-03-02 11:35:17 +08:00
moyongzhen
c977cd1c35 轨迹内容分页接口添加轨迹状态查询 2024-03-02 11:34:26 +08:00
liuwenxiang
0ae4e49e19 Merge pull request '修改字段类型' (#17) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/17
2024-03-02 11:25:53 +08:00
柳文翔
756268cb06 修改字段类型 2024-03-02 11:25:40 +08:00
liuwenxiang
0500165708 Merge pull request 'S01-轨迹中台' (#16) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/16
2024-03-02 11:11:34 +08:00