Commit Graph

120 Commits

Author SHA1 Message Date
moyongzhen
e510d1ce9a Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-05 20:06:18 +08:00
moyongzhen
d76e7c29a1 轨迹明细调整 2024-03-05 20:06:09 +08:00
2b299fb709 fix 订单关联sql 2024-03-05 17:42:34 +08:00
a4a04bf5a6 fix 订单关联查询sql 2024-03-05 17:25:07 +08:00
9f2667ac6e fix【S1-根据订单号获取轨迹接口-时区不填写,没有默认 +8,按模板顺序查询没有结果】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029746 2024-03-05 16:21:35 +08:00
aac436f61c Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-05 16:12:29 +08:00
moyongzhen
8eca00c66b 轨迹明细es查询 2024-03-05 16:08:52 +08:00
0bfc8708be fix 轨迹删除by查询,code未加关键字 2024-03-05 16:01:52 +08:00
362ea52f2e change 修改索引策略 2024-03-05 15:07:08 +08:00
柳文翔
9d8cdadc9c 修改问题和提示语 2024-03-05 10:50:07 +08:00
e055bedaf1 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-04 18:48:59 +08:00
22dd02507f test 轨迹查询、新增、修改、软删除 2024-03-04 18:48:43 +08:00
moyongzhen
9ba8266480 轨迹模版分页查询添加参数子系统id 2024-03-04 18:05:41 +08:00
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
4f72a4405c add 删除轨迹 2024-03-04 15:30:57 +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
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
柳文翔
28462ffc83 修改 2024-03-04 10:20:02 +08:00
柳文翔
51fe08f607 修改 2024-03-02 18:02:06 +08:00
柳文翔
131bf85708 分页 2024-03-02 16:58:58 +08:00
柳文翔
569f566fe2 排序 2024-03-02 16:41:07 +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
ea288979b4 枚举值调整 2024-03-02 16:19:50 +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
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
柳文翔
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
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
柳文翔
f569a16f60 添加选中项 2024-03-02 10:44:24 +08:00
柳文翔
6c10a6e21c 完成 轨迹模板内容排序 接口 2024-03-02 10:07:59 +08:00
柳文翔
92f61e1a1b 完成 轨迹推送配置内容排序 接口 2024-03-02 10:00:08 +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