Commit Graph

1380 Commits

Author SHA1 Message Date
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
柳文翔
e40ea3bdba 修改轨迹内容时同步修改轨迹内容映射 2024-03-01 21:42:32 +08:00
liuwenxiang
7f7dab910c Merge pull request '完成 轨迹内容映射编辑 接口' (#8) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/8
2024-03-01 21:13:12 +08:00
柳文翔
ad56431c39 完成 轨迹内容映射编辑 接口 2024-03-01 21:11:43 +08:00
liuwenxiang
dbec2f00fd Merge pull request '创建 轨迹内容映射编辑 接口' (#7) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/7
2024-03-01 20:59:02 +08:00
柳文翔
2292b7433d 创建 轨迹内容映射编辑 接口 2024-03-01 20:58:48 +08:00
liuwenxiang
6a5775819f Merge pull request '完成 轨迹内容映射详情 接口' (#6) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/6
2024-03-01 20:42:17 +08:00
柳文翔
867b987f9a 完成 轨迹内容映射详情 接口 2024-03-01 20:42:06 +08:00
liuwenxiang
9ae6a0c359 Merge pull request '完成 轨迹内容映射列表 接口' (#5) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/5
2024-03-01 20:30:39 +08:00
柳文翔
3d91f9c632 完成 轨迹内容映射列表 接口 2024-03-01 20:30:17 +08:00
moyongzhen
81a8e077fc 轨迹订单添加订单类型显示名称 2024-03-01 19:18:23 +08:00
moyongzhen
375de5268d 分页的轨迹订单 2024-03-01 19:14:20 +08:00
moyongzhen
61cc6aafc5 添加注释 2024-03-01 19:02:21 +08:00
moyongzhen
56875e923a 轨迹明细仓库去掉轨迹明细接口 2024-03-01 18:36:43 +08:00
moyongzhen
6e487a60c3 左连接查询加isdeleted==false 2024-03-01 18:34:05 +08:00
柳文翔
8ac687a9be 修改字段类型 2024-03-01 18:09:00 +08:00
柳文翔
d6ea92bd20 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 18:00:18 +08:00
柳文翔
a8b0892ab6 完成 轨迹推送配置内容编辑 接口 2024-03-01 18:00:15 +08:00
moyongzhen
e6ae2ca464 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 17:53:27 +08:00
moyongzhen
d8065bb9d1 轨迹标记添加选中 2024-03-01 17:53:15 +08:00
38f69d0dc5 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 17:50:25 +08:00
545efbeaf3 临时提交 2024-03-01 17:49:20 +08:00
柳文翔
3505a4dbcc 完成 轨迹推送配置编辑 接口 2024-03-01 17:07:11 +08:00