From e5618b45efed5afc042e852c147a24a762f6616b Mon Sep 17 00:00:00 2001 From: M_Kececi Date: Thu, 18 Jun 2026 14:00:08 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- svc/routes/wholesale_campaigns.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svc/routes/wholesale_campaigns.go b/svc/routes/wholesale_campaigns.go index 4b8d5e2..ca05ca7 100644 --- a/svc/routes/wholesale_campaigns.go +++ b/svc/routes/wholesale_campaigns.go @@ -486,7 +486,7 @@ SELECT COALESCE(sc.code,'') AS code, COALESCE(sc.title,'') AS title, COALESCE(sc.discount_rate, 0)::float8 AS discount_rate, - COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'YYYY-MM-DD HH24:MI:SS'), '') AS at + COALESCE(to_char(z.zlins_dttm, 'YYYY-MM-DD HH24:MI:SS'), '') AS at FROM zbggcampaign z LEFT JOIN sdcampaign sc ON sc.id = z.sdcampaign_id @@ -877,7 +877,7 @@ SELECT COALESCE(sc.code,'') AS code, COALESCE(sc.title,'') AS title, COALESCE(sc.discount_rate, 0)::float8 AS discount_rate, - COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'YYYY-MM-DD HH24:MI:SS'), '') AS campaign_last_dttm + COALESCE(to_char(z.zlins_dttm, 'YYYY-MM-DD HH24:MI:SS'), '') AS campaign_last_dttm FROM latest l LEFT JOIN zbggcampaign z ON z.id = l.z_id