Merge branch 'dev2.3.12' of http://192.168.3.207:8080/group3/qmx_admin into dev2.3.12

src/templateManage/jyTemplateManageController.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/baiy/Cadmin-server-go/admin"
 	"math/rand"
+	qutil "qfw/util"
 	"time"
 	"util"
 )
@@ -109,8 +110,8 @@ func Add(context *admin.Context) (interface{}, error) {
 		"template_id":   fmt.Sprint(now.Unix()) + fmt.Sprint(rand.Intn(100)),
 		"create_people": context.User.Username,
 		"last_people":   context.User.Username,
-		"create_time":   now.Local(),
-		"last_time":     now.Local(),
+		"create_time":   now.Format(qutil.Date_Full_Layout),
+		"last_time":     now.Format(qutil.Date_Full_Layout),
 		"state":         "1",
 	})
 	if id <= 0 {
@@ -129,7 +130,7 @@ func Delete(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	if param.Id != 0 {
-		ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": param.Id}, map[string]interface{}{"state": 0, "last_time": time.Now(), "last_people": context.User.Username})
+		ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": param.Id}, map[string]interface{}{"state": 0, "last_time": time.Now().Format(qutil.Date_Full_Layout), "last_people": context.User.Username})
 		if !ok {
 			return nil, errors.New("删除模板信息失败")
 		}

src/templateManage/jyTemplateManageService.go

@@ -1,6 +1,7 @@
 package templateManage
 
 import (
+	qutil "qfw/util"
 	"time"
 	"util"
 )
@@ -17,7 +18,7 @@ func FindOneTemplate(id int) (res map[string]interface{}) {
 }
 
 func UpdateSceneOne(id int, newsContent, newsTitle, newsType, pcLink, templateName, wxLink, androidLink, appleLink, username string) bool {
-	ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": id}, map[string]interface{}{"news_content": newsContent, "news_title": newsTitle, "news_type": newsType, "pc_link": pcLink, "template_name": templateName, "wx_link": wxLink, "android_link": androidLink, "apple_link": appleLink, "last_time": time.Now().Local(), "last_people": username})
+	ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": id}, map[string]interface{}{"news_content": newsContent, "news_title": newsTitle, "news_type": newsType, "pc_link": pcLink, "template_name": templateName, "wx_link": wxLink, "android_link": androidLink, "apple_link": appleLink, "last_time": time.Now().Format(qutil.Date_Full_Layout), "last_people": username})
 	if !ok {
 		return false
 	}