From 620be40e34215c989730b2e81cce482153e10cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com> Date: Mon, 2 Dec 2024 09:51:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=A1=E8=B4=B9=E4=B8=AD=E8=B4=A6=E6=88=B7=E8=AE=A1=E8=B4=B9?= =?UTF-8?q?=E9=A1=B9=20id=20=E8=AE=B0=E5=BD=95=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/entities/JobInfo.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/mis-server/src/entities/JobInfo.ts b/apps/mis-server/src/entities/JobInfo.ts index 5f72dfbbaf..f7c14989a4 100644 --- a/apps/mis-server/src/entities/JobInfo.ts +++ b/apps/mis-server/src/entities/JobInfo.ts @@ -146,7 +146,7 @@ export class JobInfo { this.tenantPrice = jobPriceInfo.tenant?.price ?? new Decimal(0); this.tenantBillingItemId = jobPriceInfo.tenant?.billingItemId ?? UNKNOWN_PRICE_ITEM; this.accountPrice = jobPriceInfo.account?.price ?? new Decimal(0); - this.accountBillingItemId = jobPriceInfo.tenant?.billingItemId ?? UNKNOWN_PRICE_ITEM; + this.accountBillingItemId = jobPriceInfo.account?.billingItemId ?? UNKNOWN_PRICE_ITEM; this.timeSubmit = new Date(job.submitTime!); this.timeStart = new Date(job.startTime!); From ff731d4e9eff5f598802b7e72f7940a4b0b2c692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com> Date: Mon, 2 Dec 2024 10:00:29 +0800 Subject: [PATCH 2/2] Create kind-lemons-smoke.md --- .changeset/kind-lemons-smoke.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/kind-lemons-smoke.md diff --git a/.changeset/kind-lemons-smoke.md b/.changeset/kind-lemons-smoke.md new file mode 100644 index 0000000000..5fc44b4778 --- /dev/null +++ b/.changeset/kind-lemons-smoke.md @@ -0,0 +1,5 @@ +--- +"@scow/mis-server": patch +--- + +修复记录账户计费计费项 id 错误的问题