From ae6883ce426727efca4facab973d814ae66c69c2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 11 八月 2023 16:50:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

---
 model/plan.go |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/model/plan.go b/model/plan.go
index a8ccdda..6441c30 100644
--- a/model/plan.go
+++ b/model/plan.go
@@ -3,7 +3,6 @@
 import (
 	"aps_crm/pkg/mysqlx"
 	"gorm.io/gorm"
-	"time"
 )
 
 type (
@@ -16,8 +15,8 @@
 		SubOrder       SubOrder     `json:"subOrder" gorm:"foreignKey:SubOrderId"`
 		SalesDetailsId int          `json:"salesDetailsId" gorm:"column:sales_details_id;type:int;comment:閿�鍞槑缁唅d"`
 		SalesDetails   SalesDetails `json:"salesDetails" gorm:"foreignKey:SalesDetailsId"`
-		StartTime      time.Time    `json:"startTime" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"`
-		EndTime        time.Time    `json:"endTime" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
+		StartTime      *CustomTime  `json:"startTime" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"`
+		EndTime        *CustomTime  `json:"endTime" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
 		Content        string       `json:"content" gorm:"column:content;type:varchar(255);comment:璁″垝鍐呭"`
 		File           string       `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
 		gorm.Model     `json:"-"`
@@ -111,4 +110,4 @@
 func (slf *PlanSearch) SetOrder(order string) *PlanSearch {
 	slf.OrderBy = order
 	return slf
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0