Merge remote-tracking branch 'origin/master' into delete_note

# Conflicts:
#	models/data_manage/ppt_v2_save_log.go

models/data_manage/ppt_v2_save_log.go

@@ -5,7 +5,6 @@ import (
 )
 
 func DeletePPTLogByDate(date string) (err error) {
-
 	sql := `DELETE FROM ppt_v2_save_log WHERE create_time<? `
 	err = global.DmSQL["rddp"].Exec(sql, date).Error
 	return