Commit Graph

1399 Commits

Author SHA1 Message Date
dingenwen
ba095bd498 修改配置 2024-04-01 16:48:26 +08:00
5c4b79fd0c Merge branch 'S03-轨迹中台' into dev
# Conflicts:
#	src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs
#	src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
2024-04-01 16:09:11 +08:00
e85e3244bf 全量推送 2024-04-01 16:07:35 +08:00
3ebbe620af feature:【轨迹推送支持顺序互换】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001017011
2024-03-30 15:54:51 +08:00
a58b9e264a change:【轨迹的完成根据拉取配置判断】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001017014
2024-03-30 15:50:25 +08:00
f7c091dee6 add:【轨迹模板新增编辑页面增加字段“对外显示源轨迹”】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001017015
2024-03-30 15:50:23 +08:00
dingenwen
ca71e1ff27 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-30 15:24:57 +08:00
44673e2f5a Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-30 15:24:51 +08:00
322a3a67ed fix:预警OOM 2024-03-30 15:24:11 +08:00
3de76a713d important:重构 2024-03-30 11:52:49 +08:00
83f391dfcc Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-29 15:29:35 +08:00
8962d032b1 7.0.0 2024-03-29 15:26:39 +08:00
moyongzhen
5818d8ddd8 对外接口返参调整 2024-03-29 14:39:30 +08:00
moyongzhen
9d29759cc0 对外接口包 unifyResultDto 2024-03-29 14:29:17 +08:00
moyongzhen
3a179e7436 对外接口包 unifyResultDto 2024-03-29 14:14:19 +08:00
moyongzhen
f24168b62d Revert "debug"
This reverts commit a02e4ca8b2.
2024-03-29 11:40:00 +08:00
moyongzhen
a02e4ca8b2 debug 2024-03-29 11:17:35 +08:00
moyongzhen
94b3921d1a Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev 2024-03-29 11:13:32 +08:00
moyongzhen
354c0a5b86 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into dev 2024-03-29 11:02:00 +08:00
443b55f1dd Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-28 11:47:51 +08:00
dingenwen
e39814146a Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-28 11:47:06 +08:00
f20ee5f0a2 change cap filter 2024-03-28 11:46:25 +08:00
dingenwen
bbf9755c24 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-28 11:28:02 +08:00
24c47652d8 Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台
# Conflicts:
#	src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
2024-03-28 11:26:42 +08:00
2c6d730c4b fix:拉取缓存不存在应该返回null 2024-03-28 11:25:00 +08:00
dingenwen
44ef1d1199 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-28 11:10:52 +08:00
e9af631ee4 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into S02-轨迹中台第二部分 2024-03-28 11:09:15 +08:00
c8b3b99633 fix:轨迹刷新没有拉取配置的case 2024-03-28 11:08:23 +08:00
dingenwen
642bbb2f18 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-28 10:44:17 +08:00
dingenwen
febb7e3bea Merge branch 'S02-轨迹中台第二部分' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台第二部分 2024-03-28 10:35:52 +08:00
dingenwen
0b49336d7a 调整版本号 2024-03-28 10:35:43 +08:00
f9c61219e9 升级接口通7.1.8 2024-03-28 10:35:15 +08:00
dingenwen
2588e0e2e0 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-27 19:04:07 +08:00
2304a1f918 fix 轨迹刷新 attach base64问题 2024-03-27 18:58:03 +08:00
dingenwen
9f3085a75b Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-27 17:22:36 +08:00
b98742f431 change remove topic prefix 2024-03-27 17:21:46 +08:00
dingenwen
d635588dbe Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-27 16:53:52 +08:00
676cdad78c fix 手动更新bug 2024-03-27 16:50:40 +08:00
dingenwen
3fb1b11241 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-27 15:00:33 +08:00
140acc23d9 Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-27 14:53:39 +08:00
41755830f6 fix 轨迹明细操作人默认系统 2024-03-27 14:51:51 +08:00
10d6f28fc8 1 2024-03-27 14:49:19 +08:00
dingenwen
3887fbcdbd Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-27 11:11:17 +08:00
dcc7ec5918 opt:美化代码 2024-03-27 11:09:36 +08:00
b81733b011 change:轨迹刷新不做幂等 2024-03-27 11:03:07 +08:00
e9d304873e 补 2024-03-27 11:00:11 +08:00
dingenwen
08cbb18f6f Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-27 10:52:30 +08:00
5aa6596a7b attach 2024-03-27 10:51:07 +08:00
dingenwen
489c548b04 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-27 10:42:02 +08:00
6021e7c5d9 防gank 2024-03-27 10:40:39 +08:00