Merge branch 'feature/eta1.2.2_day_val' into debug

# Conflicts:
#	models/data_manage/edb_data_base.go
#	utils/constants.go

models/data_manage/edb_data_base.go

@@ -154,6 +154,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_predict_calculate_zsxy" // 预测指数修匀->73
 	case utils.DATA_SOURCE_CALCULATE_ZDYFX:
 		tableName = "edb_data_calculate_zdyfx" // 自定义分析->74
+	case utils.DATA_SOURCE_CALCULATE_RJZ: //日均值->75
+		tableName = "edb_data_calculate_rjz"
 	default:
 		tableName = ""
 	}

utils/constants.go

@@ -163,6 +163,7 @@ const (
 	DATA_SOURCE_CALCULATE_ZSXY                                  // 指数修匀->72
 	DATA_SOURCE_PREDICT_CALCULATE_ZSXY                          // 预测指数修匀->73
 	DATA_SOURCE_CALCULATE_ZDYFX                                 // 自定义分析->74
+	DATA_SOURCE_CALCULATE_RJZ                                   // 日均值计算->75
 )
 
 // 数据刷新频率