fix(数据中心): 合并代码

src/views/dataCenter/industrial/model/BusinessIncome/index.vue

@@ -46,15 +46,9 @@ import * as echarts from "echarts";
 import { Aim } from "@element-plus/icons";
 
 const PIE_LIST = [
-<<<<<<< HEAD
-  { label: "数字军工（网络、人工智能）领域", value: 932.66 },
-  { label: "高端装备领域", value:383.17 },
-  { label: "核电（新能源领域）", value: 311.27 },
-=======
   { label: "数字军工(网络、人工智能)领域", value: 932.66 },
   { label: "高端装备领域", value: 383.17 },
   { label: "核电(新能源领域)", value: 311.27 },
->>>>>>> 312068b28f312777423027b138514e4ac4bcc72e
   { label: "生物安全领域", value: 267.96 },
   { label: "航空航天领域", value: 269.18 },
   { label: "船舶与海洋装备领域", value: 84.22 },