From 592e93b2c92794ba1a5af4c6497480121d621fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Wed, 17 Aug 2022 14:01:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(excel):=E5=A2=9E=E5=8A=A00.4kV=E8=A1=A8?= =?UTF-8?q?=E8=AE=A1=E6=A1=A3=E6=A1=88Excel=E7=9A=84=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/meter_04kv_template.xlsx | Bin 10519 -> 10522 bytes model/meter_04kv.go | 18 +++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/meter_04kv_template.xlsx b/assets/meter_04kv_template.xlsx index 4221156c6c95ee4e555a7d7a19d51d404a662166..ca392706b599c50cae499505a8d03fd234a17c37 100644 GIT binary patch delta 5518 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 Bj@SSI diff --git a/model/meter_04kv.go b/model/meter_04kv.go index 98ce5c1..70a5da5 100644 --- a/model/meter_04kv.go +++ b/model/meter_04kv.go @@ -6,16 +6,16 @@ import ( type Meter04KV struct { CreatedAndModified `xorm:"extends"` - Code string `xorm:"varchar(120) pk not null" json:"code"` + Code string `xorm:"varchar(120) pk not null" json:"code" excel:"code"` ParkId string `xorm:"varchar(120) pk not null" json:"parkId"` - Address *string `xorm:"varchar(100)" json:"address"` - CustomerName *string `xorm:"varchar(100)" json:"customerName"` - ContactName *string `xorm:"varchar(70)" json:"contactName"` - ContactPhone *string `xorm:"varchar(50)" json:"contactPhone"` - Ratio decimal.Decimal `xorm:"numeric(8,4) not null default 1" json:"ratio"` - Seq int64 `xorm:"bigint not null" json:"seq"` - IsPublicMeter bool `xorm:"'public_meter' bool not null default false" json:"isPublicMeter"` - WillDilute bool `xorm:"'dilute' bool not null default false" json:"willDilute"` + Address *string `xorm:"varchar(100)" json:"address" excel:"address"` + CustomerName *string `xorm:"varchar(100)" json:"customerName" excel:"name"` + ContactName *string `xorm:"varchar(70)" json:"contactName" excel:"contact"` + ContactPhone *string `xorm:"varchar(50)" json:"contactPhone" excel:"phone"` + Ratio decimal.Decimal `xorm:"numeric(8,4) not null default 1" json:"ratio" excel:"ratio"` + Seq int64 `xorm:"bigint not null" json:"seq" excel:"seq"` + IsPublicMeter bool `xorm:"'public_meter' bool not null default false" json:"isPublicMeter" excel:"public"` + WillDilute bool `xorm:"'dilute' bool not null default false" json:"willDilute" excel:"dilute"` Enabled bool `xorm:"bool not null default true" json:"enabled"` }