Merge branch 'dev2.7.3' of http://192.168.3.207:10080/qmx/jy into dev2.7.3

src/jfw/front/swordfish.go

@@ -2424,7 +2424,7 @@ func (f *Front) HasPushHistory() {
 	selectTime := f.GetString("selectTime")
 	lenStr := len([]rune(selectTime))
 	if selectTime != "" {
-		if selectTime != "undefined" && lenStr > 10 {
+		if selectTime != "undefined" && lenStr >= 10 {
 			selectTime = selectTime[0:10]
 			select_time, _ := strconv.ParseInt(selectTime, 10, 64)
 			//转化

src/jfw/modules/app/src/app/front/swordfish.go

@@ -681,7 +681,7 @@ func (f *Front) HasPushHistory() {
 	lenStr := len([]rune(selectTime))
 	//TODO 可以优化
 	if selectTime != "" {
-		if selectTime != "undefined" && lenStr > 10 {
+		if selectTime != "undefined" && lenStr >= 10 {
 			selectTime = selectTime[0:10]
 			select_time, _ := strconv.ParseInt(selectTime, 10, 64)
 			//转化