合并代码冲突处理

src/views/stationOperation/components/MapMarker.vue

@@ -217,11 +217,7 @@ export default {
     // 获取站点详情
     async _getStationInfo(stationInfo) {
       try {
-<<<<<<< HEAD
         const { success, result, message } = await getAction('/stationOperation/findInfo', {
-=======
-        const { success, result, message } = await getAction('/armd-station-operation/stationOperation/findInfo', {
->>>>>>> master-dev
           stationId: stationInfo.stationId,
           type: stationInfo.stationType,
         })

src/views/stationOperation/index.vue

@@ -253,11 +253,7 @@ export default {
     async getStationList() {
       try {
         this.isGettingDataList = true
-<<<<<<< HEAD
         const res = await getAction('/stationOperation/findList')
-=======
-        const res = await getAction('/armd-station-operation/stationOperation/findList')
->>>>>>> master-dev
         res.forEach((item) => {
           const { stationId, stationName, stationType } = item
           item._stationId = `${stationId}${stationName}${stationType}`
@@ -368,11 +364,7 @@ export default {
     async getFollowedStationList() {
       try {
         this.isGettingFollowedDataList = true
-<<<<<<< HEAD
         const res = await getAction('/sysUserFocusStation/findList')
-=======
-        const res = await getAction('/armd-station-operation/sysUserFocusStation/findList')
->>>>>>> master-dev
         this.followedDataList = res
 
         const scrollContainer2Ref = this.$refs.scrollContainer2Ref
@@ -391,11 +383,7 @@ export default {
     // 获取站点类型
     async getStationTypeList() {
       try {
-<<<<<<< HEAD
         const res = await getAction('/stationOperation/findStationType')
-=======
-        const res = await getAction('/armd-station-operation/stationOperation/findStationType')
->>>>>>> master-dev
         this.stationTypeList = res.filter((item) => item).map((item) => ({ label: item, value: item }))
       } catch (error) {
         console.error(error)