Merge branch 'dev-zhengzhou' into test

@@ -90,7 +90,8 @@ func compareTask(u *domain.UserAuth, srcTask *domain.Task, newTask *domain.Task)
 		if newTask.EndTime == 0 {
 		if newTask.EndTime == 0 {
 			logOpt.OptValue = "未设置时间"
 			logOpt.OptValue = "未设置时间"
 		} else {
 		} else {
-			logOpt.OptValue = time.Unix(newTask.EndTime, 0).Local().Format("2006-01-02 15:04:05")
+			logOpt.OptValue = time.Unix(newTask.EndTime, 0).Local().Format("2006-01-02")
+			//logOpt.OptValue = time.Unix(newTask.EndTime, 0).Local().Format("2006-01-02 15:04:05")
 		}
 		}
 		logArray = append(logArray, logOpt)
 		logArray = append(logArray, logOpt)
 	}
 	}
@@ -123,7 +124,7 @@ func compareTask(u *domain.UserAuth, srcTask *domain.Task, newTask *domain.Task)
 	if srcTask.AssistFlagMax != newTask.AssistFlagMax {
 	if srcTask.AssistFlagMax != newTask.AssistFlagMax {
 		logOpt := createdLogOpt(u, taskId)
 		logOpt := createdLogOpt(u, taskId)
 		logOpt.OptField = "修改了上级辅导时间"
 		logOpt.OptField = "修改了上级辅导时间"
-		logOpt.OptValue = strconv.Itoa(newTask.AssistFlagMax)
+		logOpt.OptValue = strconv.Itoa(newTask.AssistFlagMax) + "天"
 		logArray = append(logArray, logOpt)
 		logArray = append(logArray, logOpt)
 	}
 	}
 
 
@@ -209,7 +210,8 @@ func compareStage(u *domain.UserAuth, id int, srcStage []*domain.TaskStage, newS
 				if it.PlanCompletedAt == 0 {
 				if it.PlanCompletedAt == 0 {
 					logOpt.OptValue = "未设置时间"
 					logOpt.OptValue = "未设置时间"
 				} else {
 				} else {
-					logOpt.OptValue = time.Unix(it.PlanCompletedAt, 0).Local().Format("2006-01-02 15:04:05")
+					logOpt.OptValue = time.Unix(it.PlanCompletedAt, 0).Local().Format("2006-01-02")
+					//logOpt.OptValue = time.Unix(it.PlanCompletedAt, 0).Local().Format("2006-01-02 15:04:05")
 				}
 				}
 				logArray = append(logArray, logOpt)
 				logArray = append(logArray, logOpt)
 			}
 			}