ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,376 Commits 2 Branches 0 Tags 4.7 MiB
d5b2bfd5ec
Commit Graph

1376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
柳文翔
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
柳文翔
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