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

329 Commits

Author SHA1 Message Date
moyongzhen
c2e3a4d26e Merge branch 'test' into S01-轨迹中台 2024-03-04 16:43:36 +08:00
moyongzhen
cc325aa496 轨迹内容调整 2024-03-04 16:42:52 +08:00
李鹏军
b6e0abc03f Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-04 15:32:01 +08:00
李鹏军
4f72a4405c add 删除轨迹 2024-03-04 15:30:57 +08:00
柳文翔
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
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
李鹏军
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
柳文翔
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
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
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
柳文翔
6a5db2f2f9 Merge branch 'S01-轨迹中台' into test 2024-03-02 18:03:24 +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
柳文翔
131bf85708 分页 2024-03-02 16:58:58 +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
柳文翔
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
柳文翔
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
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
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
柳文翔
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
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
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
柳文翔
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
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
柳文翔
046999c208 补充提交 2024-03-02 13:54:26 +08:00
柳文翔
bed691aa71 修改 2024-03-02 13:52:51 +08:00
柳文翔
fefc52638a 去重 2024-03-02 13:01:35 +08:00
柳文翔
884a802481 字段修改 2024-03-02 12:47:20 +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
cbdba985c2 验证 轨迹订单 页面 列表数据 显示是否正确-列表数据按创建时间倒序显示 2024-03-02 12:07:11 +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
c977cd1c35 轨迹内容分页接口添加轨迹状态查询 2024-03-02 11:34:26 +08:00
柳文翔
756268cb06 修改字段类型 2024-03-02 11:25:40 +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
柳文翔
925bf307b9 添加返回值 2024-03-02 11:03:12 +08:00
柳文翔
f569a16f60 添加选中项 2024-03-02 10:44:24 +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
e1958fe96e 调整提示语 2024-03-02 09:59:04 +08:00
moyongzhen
e9128e1985 轨迹状态提示语 2024-03-02 09:54:40 +08:00
moyongzhen
2dc9c7f31b 轨迹状态校验 2024-03-02 09:50:31 +08:00
moyongzhen
6ab8472a4c 轨迹模版提示语 2024-03-02 09:41:05 +08:00
dingenwen
4e6b9671e1 修改配置 2024-03-02 09:17:16 +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
柳文翔
a4718386f1 删除 2024-03-01 23:21:49 +08:00
柳文翔
a327f0bcbf 修改接口 2024-03-01 23:08:25 +08:00
柳文翔
777cf29baa 修改轨迹推送 2024-03-01 22:11:45 +08:00
柳文翔
e40ea3bdba 修改轨迹内容时同步修改轨迹内容映射 2024-03-01 21:42:32 +08:00
柳文翔
ad56431c39 完成 轨迹内容映射编辑 接口 2024-03-01 21:11:43 +08:00
柳文翔
2292b7433d 创建 轨迹内容映射编辑 接口 2024-03-01 20:58:48 +08:00
柳文翔
867b987f9a 完成 轨迹内容映射详情 接口 2024-03-01 20:42:06 +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
moyongzhen
e3a8a94e1e 轨迹标记也添加选中 2024-03-01 16:38:41 +08:00
moyongzhen
8bf416104a Merge branch 'S01-轨迹中台' into dev 2024-03-01 15:46:35 +08:00
moyongzhen
2c28dafdb6 bug解决 2024-03-01 15:46:07 +08:00
moyongzhen
b0bdc7111b 查询 ?可空 2024-03-01 15:45:39 +08:00
moyongzhen
ef6320b990 Merge branch 'S01-轨迹中台' into dev 2024-03-01 15:41:16 +08:00
moyongzhen
205526e370 轨迹模版，轨迹状态查询添加选中的id 2024-03-01 15:40:33 +08:00
liuwenxiang
5effee08e4 Merge pull request 'S01-轨迹中台' (#4) from S01-轨迹中台 into dev 
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/4
 2024-03-01 15:27:47 +08:00
李鹏军
3921f00e4b Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 15:07:54 +08:00
李鹏军
ef8ee7acb6 适配vs 2024-03-01 15:07:40 +08:00
moyongzhen
766e243ca0 轨迹订单明细 2024-03-01 14:26:52 +08:00
李鹏军
cf76f52ecc Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 14:22:07 +08:00
李鹏军
60c2b221ea 添加轨迹发生事件 2024-03-01 14:21:54 +08:00
liuwenxiang
d29d468bc6 Merge pull request 'S01-轨迹中台' (#3) from S01-轨迹中台 into dev 
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/3
 2024-03-01 14:11:23 +08:00
柳文翔
a54f071769 完成 轨迹推送配置内容详情 接口 2024-03-01 14:10:37 +08:00
moyongzhen
64963d2f42 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 11:54:29 +08:00
moyongzhen
6580831a4a 轨迹明细使用订单id查询 2024-03-01 11:54:22 +08:00
李鹏军
2a4a550fa8 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 11:53:42 +08:00
李鹏军
ee05cc8cff 临时提交 2024-03-01 11:53:29 +08:00
liuwenxiang
fd969dd725 Merge pull request 'S01-轨迹中台' (#2) from S01-轨迹中台 into dev 
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/2
 2024-03-01 11:51:11 +08:00
柳文翔
21f2c215d7 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 11:50:43 +08:00
柳文翔
8161c8bca2 修改关键字字段类型 2024-03-01 11:50:41 +08:00
moyongzhen
adae3501fa 解决冲突 2024-03-01 10:38:39 +08:00
moyongzhen
2ea78adbb7 轨迹订单查询 2024-03-01 10:36:25 +08:00
李鹏军
7f14abe027 清理工程文件 2024-03-01 10:27:55 +08:00
李鹏军
945463dc91 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 10:15:03 +08:00
李鹏军
a2e458e57f 抽象应用契约层 2024-03-01 10:14:49 +08:00
柳文翔
adc30d39c7 完成 轨迹推送配置详情 接口 2024-03-01 10:12:14 +08:00
李鹏军
95d91559e8 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 09:49:34 +08:00
李鹏军
0763cbf263 重组项目依赖 2024-03-01 09:48:49 +08:00
柳文翔
62711af125 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 09:44:43 +08:00
柳文翔
3578e82bed 完成 轨迹推送配置内容列表 接口 2024-03-01 09:44:41 +08:00
李鹏军
4c7a94bfff Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 09:39:50 +08:00
李鹏军
3260a70fe6 调整目录 2024-03-01 09:39:35 +08:00
liuwenxiang
7636c6a100 Merge pull request '完成 轨迹推送配置列表 接口' (#1) from S01-轨迹中台 into dev 
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/1
 2024-03-01 09:26:38 +08:00
柳文翔
c3886b1d8b 完成 轨迹推送配置列表 接口 2024-03-01 09:26:11 +08:00
moyongzhen
7a58d3d963 Merge branch 'S01-轨迹中台' into dev 2024-03-01 09:11:56 +08:00
moyongzhen
2998d69ed9 轨迹标记编辑输入参数，字符串类型加上 ? 可空 2024-03-01 09:11:27 +08:00
moyongzhen
159ac8b029 获取分页的轨迹订单 2024-02-29 21:09:25 +08:00
李鹏军
2e125f8662 解决冲突 2024-02-29 20:12:03 +08:00
moyongzhen
543ad77141 Merge branch 'S01-轨迹中台' into dev 2024-02-29 19:46:43 +08:00
moyongzhen
2603cd1ac4 编辑时，字符串类型的必须加?可空 2024-02-29 19:45:13 +08:00
moyongzhen
2825c7f720 Merge branch 'S01-轨迹中台' into dev 2024-02-29 19:08:00 +08:00
moyongzhen
b139734d57 修复新增编辑时，获取不到用户id的问题 2024-02-29 19:06:34 +08:00
moyongzhen
dc066efed9 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-02-29 18:33:50 +08:00
moyongzhen
57749fc32e 添加授权拦截 2024-02-29 18:33:43 +08:00