合并冲突解决

pagesA/fire/fire_station/people_fireStation/people_fireStation.vue

@@ -46,11 +46,8 @@
 				</u-form-item> -->
 				<u-form-item class="antherStyle">
 					<p style="width: 150rpx;">人员类型</p>
-<<<<<<< HEAD
 					<uni-data-select v-model="person.power" :localdata="selectType" @change="change"></uni-data-select>
-=======
-					<uni-data-select v-model="person.worker" :localdata="range" @change="change"></uni-data-select>
->>>>>>> bdbe9533586d59f8b53dd7c46d65e08d66f11643
+					<!-- <uni-data-select v-model="person.worker" :localdata="range" @change="change"></uni-data-select> -->
 				</u-form-item>
 				<u-form-item>
 					<u-button type="primary" @click="addSure" class="antherBtn">提交</u-button>