From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
model/timeSpent.go | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/model/timeSpent.go b/model/timeSpent.go
index de29623..6243445 100644
--- a/model/timeSpent.go
+++ b/model/timeSpent.go
@@ -12,18 +12,18 @@
// TimeSpent 鑺辫垂鏃堕棿
TimeSpent 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;type:varchar(255);not null;default:'';comment:鍚嶇О"`
}
// TimeSpentSearch 鑺辫垂鏃堕棿鎼滅储鏉′欢
TimeSpentSearch struct {
TimeSpent
- Orm *gorm.DB
- QueryClass constvar.TimeSpentQueryClass
- KeywordType constvar.TimeSpentKeywordType
- Keyword string
- PageNum int
- PageSize int
+ Orm *gorm.DB
+ QueryClass constvar.TimeSpentQueryClass
+ KeywordType constvar.TimeSpentKeywordType
+ Keyword string
+ PageNum int
+ PageSize int
}
)
--
Gitblit v1.8.0