Commit Graph

402 Commits

Author SHA1 Message Date
柳文翔
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
柳文翔
51fe08f607 修改 2024-03-02 18:02:06 +08:00
liuwenxiang
d852b804bb Merge pull request '分页' (#38) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/38
2024-03-02 16:59:20 +08:00
liuwenxiang
b629aa6eaf Merge pull request '分页' (#37) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/37
2024-03-02 16:59:12 +08:00
柳文翔
131bf85708 分页 2024-03-02 16:58:58 +08:00
liuwenxiang
36c9d8b82d Merge pull request '排序' (#36) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/36
2024-03-02 16:41:55 +08:00
liuwenxiang
156460db65 Merge pull request '排序' (#35) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/35
2024-03-02 16:41:28 +08:00
柳文翔
569f566fe2 排序 2024-03-02 16:41:07 +08:00
dingenwen
7bfba6e382 Merge branch 'S01-轨迹中台' into test 2024-03-02 16:34:29 +08:00
liuwenxiang
2841ae66da Merge pull request 'S01-轨迹中台' (#34) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/34
2024-03-02 16:21:25 +08:00
柳文翔
07f603acef Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 16:21:05 +08:00
柳文翔
4cd66079d0 完成 轨迹模板内容下拉框 接口 2024-03-02 16:21:04 +08:00
moyongzhen
96c29ae55d Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev 2024-03-02 16:19:59 +08:00
moyongzhen
ea288979b4 枚举值调整 2024-03-02 16:19:50 +08:00
liuwenxiang
1967890dba Merge pull request 'S01-轨迹中台' (#33) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/33
2024-03-02 15:54:43 +08:00
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