From f5e2c16e70ef2fa62ba2daa1addefe7720dadf13 Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期四, 17 八月 2023 20:06:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- model/severity.go | 21 ++++-- model/invoiceType.go | 20 ++++-- model/timeSpent.go | 9 ++ model/invoiceStatus.go | 20 ++++-- model/index.go | 3 + model/priorityLevel.go | 21 ++++-- model/serviceType.go | 22 ++++-- model/courierCompany.go | 20 ++++-- 8 files changed, 87 insertions(+), 49 deletions(-) diff --git a/model/courierCompany.go b/model/courierCompany.go index e78f481..2744a76 100644 --- a/model/courierCompany.go +++ b/model/courierCompany.go @@ -12,18 +12,18 @@ // CourierCompany 鐗╂祦鍏徃 CourierCompany struct { Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - Name string `json:"name" gorm:"column:name"` + Name string `json:"name" gorm:"column:name"` } // CourierCompanySearch 鐗╂祦鍏徃鎼滅储鏉′欢 CourierCompanySearch struct { CourierCompany - Orm *gorm.DB - QueryClass constvar.CourierCompanyQueryClass - KeywordType constvar.CourierCompanyKeywordType - Keyword string - PageNum int - PageSize int + Orm *gorm.DB + QueryClass constvar.CourierCompanyQueryClass + KeywordType constvar.CourierCompanyKeywordType + Keyword string + PageNum int + PageSize int } ) @@ -135,6 +135,10 @@ if total != 0 { return nil } - records := []*CourierCompany{} + records := []*CourierCompany{ + {1, "椤轰赴"}, + {2, "寰烽偊"}, + {3, "涓繙娴疯繍"}, + } return slf.CreateBatch(records) } diff --git a/model/index.go b/model/index.go index e35393d..abb5a56 100644 --- a/model/index.go +++ b/model/index.go @@ -103,6 +103,9 @@ NewPriorityLevelSearch(), NewSeveritySearch(), NewTimeSpentSearch(), + NewInvoiceTypeSearch(), + NewInvoiceStatusSearch(), + NewCourierCompanySearch(), } for _, model := range models { if id, ok := model.(InitDefaultData); ok { diff --git a/model/invoiceStatus.go b/model/invoiceStatus.go index dadfe4e..a4f7dac 100644 --- a/model/invoiceStatus.go +++ b/model/invoiceStatus.go @@ -12,18 +12,18 @@ // InvoiceStatus 鍙戠エ鐘舵�� InvoiceStatus struct { Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - Name string `json:"name" gorm:"column:name"` + Name string `json:"name" gorm:"column:name"` } // InvoiceStatusSearch 鍙戠エ鐘舵�佹悳绱㈡潯浠� InvoiceStatusSearch struct { InvoiceStatus - Orm *gorm.DB - QueryClass constvar.InvoiceStatusQueryClass - KeywordType constvar.InvoiceStatusKeywordType - Keyword string - PageNum int - PageSize int + Orm *gorm.DB + QueryClass constvar.InvoiceStatusQueryClass + KeywordType constvar.InvoiceStatusKeywordType + Keyword string + PageNum int + PageSize int } ) @@ -135,6 +135,10 @@ if total != 0 { return nil } - records := []*InvoiceStatus{} + records := []*InvoiceStatus{ + {1, "宸插垱寤�"}, + {2, "宸插瘎閫�"}, + {3, "鑷姩鍒涘缓"}, + } return slf.CreateBatch(records) } diff --git a/model/invoiceType.go b/model/invoiceType.go index 55eced6..14e1d3a 100644 --- a/model/invoiceType.go +++ b/model/invoiceType.go @@ -12,18 +12,18 @@ // InvoiceType 鍙戠エ绫诲瀷 InvoiceType struct { Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - Name string `json:"name" gorm:"column:name"` + Name string `json:"name" gorm:"column:name"` } // InvoiceTypeSearch 鍙戠エ绫诲瀷鎼滅储鏉′欢 InvoiceTypeSearch struct { InvoiceType - Orm *gorm.DB - QueryClass constvar.InvoiceTypeQueryClass - KeywordType constvar.InvoiceTypeKeywordType - Keyword string - PageNum int - PageSize int + Orm *gorm.DB + QueryClass constvar.InvoiceTypeQueryClass + KeywordType constvar.InvoiceTypeKeywordType + Keyword string + PageNum int + PageSize int } ) @@ -135,6 +135,10 @@ if total != 0 { return nil } - records := []*InvoiceType{} + records := []*InvoiceType{ + {1, "澧炵エ6%"}, + {2, "澧炵エ16%"}, + {3, "澧炵エ17%"}, + } return slf.CreateBatch(records) } diff --git a/model/priorityLevel.go b/model/priorityLevel.go index fad265d..ee2f3fe 100644 --- a/model/priorityLevel.go +++ b/model/priorityLevel.go @@ -12,18 +12,18 @@ // PriorityLevel 浼樺厛绾у埆 PriorityLevel struct { Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - Name string `json:"name" gorm:"column:name"` + Name string `json:"name" gorm:"column:name"` } // PriorityLevelSearch 浼樺厛绾у埆鎼滅储鏉′欢 PriorityLevelSearch struct { PriorityLevel - Orm *gorm.DB - QueryClass constvar.PriorityLevelQueryClass - KeywordType constvar.PriorityLevelKeywordType - Keyword string - PageNum int - PageSize int + Orm *gorm.DB + QueryClass constvar.PriorityLevelQueryClass + KeywordType constvar.PriorityLevelKeywordType + Keyword string + PageNum int + PageSize int } ) @@ -130,6 +130,11 @@ if total != 0 { return nil } - records := []*PriorityLevel{} + records := []*PriorityLevel{ + {1, "浣�"}, + {2, "涓�鑸�"}, + {3, "楂�"}, + {4, "绱ф��"}, + } return slf.CreateBatch(records) } diff --git a/model/serviceType.go b/model/serviceType.go index e5f7214..4602418 100644 --- a/model/serviceType.go +++ b/model/serviceType.go @@ -12,18 +12,18 @@ // ServiceType 鏈嶅姟鏂瑰紡 ServiceType struct { Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - Name string `json:"name" gorm:"column:name"` + Name string `json:"name" gorm:"column:name"` } // ServiceTypeSearch 鏈嶅姟鏂瑰紡鎼滅储鏉′欢 ServiceTypeSearch struct { ServiceType - Orm *gorm.DB - QueryClass constvar.ServiceTypeQueryClass - KeywordType constvar.ServiceTypeKeywordType - Keyword string - PageNum int - PageSize int + Orm *gorm.DB + QueryClass constvar.ServiceTypeQueryClass + KeywordType constvar.ServiceTypeKeywordType + Keyword string + PageNum int + PageSize int } ) @@ -130,6 +130,12 @@ if total != 0 { return nil } - records := []*ServiceType{} + records := []*ServiceType{ + {1, "鐢佃瘽"}, + {2, "杩滅▼"}, + {3, "閫佷慨"}, + {4, "涓婇棬"}, + {5, "鍏朵粬"}, + } return slf.CreateBatch(records) } diff --git a/model/severity.go b/model/severity.go index 291daa3..51c7f1b 100644 --- a/model/severity.go +++ b/model/severity.go @@ -12,18 +12,18 @@ // Severity 涓ラ噸绋嬪害 Severity struct { Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - Name string `json:"name" gorm:"column:name"` + Name string `json:"name" gorm:"column:name"` } // SeveritySearch 涓ラ噸绋嬪害鎼滅储鏉′欢 SeveritySearch struct { Severity - Orm *gorm.DB - QueryClass constvar.SeverityQueryClass - KeywordType constvar.SeverityKeywordType - Keyword string - PageNum int - PageSize int + Orm *gorm.DB + QueryClass constvar.SeverityQueryClass + KeywordType constvar.SeverityKeywordType + Keyword string + PageNum int + PageSize int } ) @@ -130,6 +130,11 @@ if total != 0 { return nil } - records := []*Severity{} + records := []*Severity{ + {1, "杞�"}, + {2, "涓ラ噸"}, + {3, "杈冧弗閲�"}, + {4, "鐗逛弗閲�"}, + } return slf.CreateBatch(records) } diff --git a/model/timeSpent.go b/model/timeSpent.go index 6243445..3be7ac0 100644 --- a/model/timeSpent.go +++ b/model/timeSpent.go @@ -130,6 +130,13 @@ if total != 0 { return nil } - records := []*TimeSpent{} + records := []*TimeSpent{ + {1, "1灏忔椂"}, + {2, "2灏忔椂"}, + {3, "0.5涓伐浣滄棩"}, + {4, "1涓伐浣滄棩"}, + {5, "2涓伐浣滄棩"}, + {6, "2涓伐浣滄棩浠ヤ笂"}, + } return slf.CreateBatch(records) } -- Gitblit v1.8.0