From a0d4a21a67b42e726b5769d84de68656a3be5ff8 Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Tue, 16 Jul 2024 15:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/adminserver/model/system/mallitem.go   | 38 +++++++++----------
 .../adminserver/model/system/ticketconsume.go | 14 +++----
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/server/adminserver/model/system/mallitem.go b/server/adminserver/model/system/mallitem.go
index 2fece2a0..98c94a5b 100644
--- a/server/adminserver/model/system/mallitem.go
+++ b/server/adminserver/model/system/mallitem.go
@@ -25,26 +25,26 @@ type MallItem struct {
 	Unit_price             int    `gorm:"comment:单价" json:"unit_price"`
 }
 
-func (gb *MallItem) TableName() string {
+func (mi *MallItem) TableName() string {
 	return "t_ingame_mall"
 }
 
-func (gb *MallItem) LoadFromDs(ds *f5.DataSet) {
-	gb.Idx = q5.ToInt64(ds.GetByName("idx"))
-	gb.Order_id = ds.GetByName("order_id")
-	gb.Order_type = q5.ToInt(ds.GetByName("order_type"))
-	gb.Seller = ds.GetByName("seller")
-	gb.Seller_address = ds.GetByName("seller_address")
-	gb.Goods_uniid = ds.GetByName("goods_uniid")
-	gb.Item_id = q5.ToInt(ds.GetByName("item_id"))
-	gb.Item_num = q5.ToInt64(ds.GetByName("item_num"))
-	gb.Price = q5.ToInt64(ds.GetByName("price"))
-	gb.Status = q5.ToInt(ds.GetByName("status"))
-	gb.Buyer = ds.GetByName("buyer")
-	gb.Buy_ok_time = q5.ToInt(ds.GetByName("buy_ok_time"))
-	gb.Last_modify_price_time = q5.ToInt(ds.GetByName("last_modify_price_time"))
-	gb.Createtime = q5.ToInt(ds.GetByName("createtime"))
-	gb.Modifytime = q5.ToInt(ds.GetByName("modifytime"))
-	gb.Order1 = q5.ToInt(ds.GetByName("order1"))
-	gb.Unit_price = q5.ToInt(ds.GetByName("unit_price"))
+func (mi *MallItem) LoadFromDs(ds *f5.DataSet) {
+	mi.Idx = q5.ToInt64(ds.GetByName("idx"))
+	mi.Order_id = ds.GetByName("order_id")
+	mi.Order_type = q5.ToInt(ds.GetByName("order_type"))
+	mi.Seller = ds.GetByName("seller")
+	mi.Seller_address = ds.GetByName("seller_address")
+	mi.Goods_uniid = ds.GetByName("goods_uniid")
+	mi.Item_id = q5.ToInt(ds.GetByName("item_id"))
+	mi.Item_num = q5.ToInt64(ds.GetByName("item_num"))
+	mi.Price = q5.ToInt64(ds.GetByName("price"))
+	mi.Status = q5.ToInt(ds.GetByName("status"))
+	mi.Buyer = ds.GetByName("buyer")
+	mi.Buy_ok_time = q5.ToInt(ds.GetByName("buy_ok_time"))
+	mi.Last_modify_price_time = q5.ToInt(ds.GetByName("last_modify_price_time"))
+	mi.Createtime = q5.ToInt(ds.GetByName("createtime"))
+	mi.Modifytime = q5.ToInt(ds.GetByName("modifytime"))
+	mi.Order1 = q5.ToInt(ds.GetByName("order1"))
+	mi.Unit_price = q5.ToInt(ds.GetByName("unit_price"))
 }
diff --git a/server/adminserver/model/system/ticketconsume.go b/server/adminserver/model/system/ticketconsume.go
index 4316946e..bd791e80 100644
--- a/server/adminserver/model/system/ticketconsume.go
+++ b/server/adminserver/model/system/ticketconsume.go
@@ -13,14 +13,14 @@ type TicketConsume struct {
 	Modifytime      int    `gorm:"comment:修改时间" json:"modifytime"`
 }
 
-func (gb *TicketConsume) TableName() string {
+func (tc *TicketConsume) TableName() string {
 	return "t_ticket_consume_record"
 }
 
-func (gb *TicketConsume) LoadFromDs(ds *f5.DataSet) {
-	gb.Idx = q5.ToInt64(ds.GetByName("idx"))
-	gb.Match_room_uuid = ds.GetByName("match_room_uuid")
-	gb.Account_id = ds.GetByName("account_id")
-	gb.Createtime = q5.ToInt(ds.GetByName("createtime"))
-	gb.Modifytime = q5.ToInt(ds.GetByName("modifytime"))
+func (tc *TicketConsume) LoadFromDs(ds *f5.DataSet) {
+	tc.Idx = q5.ToInt64(ds.GetByName("idx"))
+	tc.Match_room_uuid = ds.GetByName("match_room_uuid")
+	tc.Account_id = ds.GetByName("account_id")
+	tc.Createtime = q5.ToInt(ds.GetByName("createtime"))
+	tc.Modifytime = q5.ToInt(ds.GetByName("modifytime"))
 }