Commit Graph

1702 Commits

Author SHA1 Message Date
柳文翔
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
柳文翔
cd0d2a64bf Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 11:11:22 +08:00
柳文翔
92ca158be8 修改isany 2024-03-02 11:11:20 +08:00
moyongzhen
2f837a061b Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 11:03:40 +08:00
moyongzhen
0352b77dcf 订单列表添加字段 2024-03-02 11:03:33 +08:00
liuwenxiang
7fbbe2635f Merge pull request '添加返回值' (#15) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/15
2024-03-02 11:03:30 +08:00
柳文翔
925bf307b9 添加返回值 2024-03-02 11:03:12 +08:00
liuwenxiang
69a0c572f7 Merge pull request '添加选中项' (#14) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/14
2024-03-02 10:44:39 +08:00
柳文翔
f569a16f60 添加选中项 2024-03-02 10:44:24 +08:00
liuwenxiang
130c8ce17a Merge pull request 'S01-轨迹中台' (#13) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/13
2024-03-02 10:08:22 +08:00
柳文翔
6c10a6e21c 完成 轨迹模板内容排序 接口 2024-03-02 10:07:59 +08:00
柳文翔
df4772b5c5 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 10:00:11 +08:00
柳文翔
92f61e1a1b 完成 轨迹推送配置内容排序 接口 2024-03-02 10:00:08 +08:00
moyongzhen
c8afebe635 Merge branch 'S01-轨迹中台' into dev 2024-03-02 09:59:33 +08:00
moyongzhen
e1958fe96e 调整提示语 2024-03-02 09:59:04 +08:00
moyongzhen
e9128e1985 轨迹状态提示语 2024-03-02 09:54:40 +08:00
moyongzhen
c3980b6abb Merge branch 'S01-轨迹中台' into dev 2024-03-02 09:51:26 +08:00
moyongzhen
2dc9c7f31b 轨迹状态校验 2024-03-02 09:50:31 +08:00
moyongzhen
6ab8472a4c 轨迹模版提示语 2024-03-02 09:41:05 +08:00
liuwenxiang
eee208a812 Merge pull request 'S01-轨迹中台' (#12) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/12
2024-03-02 09:19:56 +08:00
dingenwen
4e6b9671e1 修改配置 2024-03-02 09:17:16 +08:00
dingenwen
51099d850b Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 09:14:28 +08:00
柳文翔
0780315c9c Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 09:13:45 +08:00
柳文翔
6d7c28652b 还原 2024-03-02 09:13:43 +08:00
moyongzhen
e4da002a82 Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev 2024-03-02 09:10:04 +08:00
moyongzhen
e2802de99e 轨迹模版新增校验 2024-03-02 09:10:00 +08:00
dingenwen
45ac0a3e53 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-02 09:00:35 +08:00
liuwenxiang
666080382b Merge pull request '删除' (#11) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/11
2024-03-01 23:22:07 +08:00
柳文翔
a4718386f1 删除 2024-03-01 23:21:49 +08:00
liuwenxiang
e049d7520b Merge pull request '修改接口' (#10) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/10
2024-03-01 23:08:42 +08:00
柳文翔
a327f0bcbf 修改接口 2024-03-01 23:08:25 +08:00
liuwenxiang
7b9fe50794 Merge pull request 'S01-轨迹中台' (#9) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/9
2024-03-01 22:12:14 +08:00
柳文翔
777cf29baa 修改轨迹推送 2024-03-01 22:11:45 +08:00