jianf/ModelRouter
1
0
Fork 0
mirror of https://gitcode.com/JianFeeeee/ModelRouter.git synced 2026-11-12 12:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复回流 main 时残留的冲突标记（billing.lua / billing_test.go 取 release/v2.0.x 干净版本）

Browse Source
This commit is contained in:
root
2026-10-20 22:05:19 +08:00
parent a073423867
commit 3ef918a87a
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/lua/billing_test.go
View File

@ -1236,8 +1236,6 @@ func TestLongContextComposesWithCacheDiscount(t *testing.T) {
// total = 0.2325
approx(t, "step composes with cache discount", got, 0.2325)
}
<<<<<<< HEAD
=======
// ---- 源层零价覆盖模型价（issue #1）---------------------------------------
//
@ -1371,4 +1369,3 @@ func TestBillingProfileDefaultPolicy(t *testing.T) {
}
}
}
>>>>>>> 7941b41 (refactor(billing)!: 计费全部沉入插件，内核零 billing 代码；规则由插件自持)