合并

src/jfw/modules/app/src/app/active/21yearEndReport.go

@@ -1,12 +1,11 @@
 package active
 
 import (
-	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
-	qutil "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jypkg/public"
 	"time"
 
-	"github.com/go-xweb/xweb"
+	qutil "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"app.yhyue.com/moapp/jypkg/public"
 )
 
 const (

src/jfw/modules/app/src/app/filter/phonefilter.go

@@ -116,23 +116,11 @@ func (l *phoneFilter) Do() bool {
 			href = "/jyapp/frontPage/verify/free/index?mode=phoneCheck"
 		}
 	}
-<<<<<<< HEAD
-	http.Redirect(l.W, l.R, href, 302)
-	return false
-}
-
-//获取当天结束时间 单位秒
-func GetExpire() int {
-	t, _ := time.ParseInLocation(Date_Short_Layout, time.Now().AddDate(0, 0, 1).Format(Date_Short_Layout), time.Local)
-	t2, _ := time.ParseInLocation(Date_Full_Layout, time.Now().Format(Date_Full_Layout), time.Local)
-	return int(t.Unix() - t2.Unix())
-=======
 	if href != "" {
 		http.Redirect(l.W, l.R, href, 302)
 		return false
 	}
 	return true
->>>>>>> master
 }
 
 //文章三级页跳转设置cookie