diff --git a/element/manuallyAdd/record.vue b/element/manuallyAdd/record.vue
index 48aa81f7..16684cbc 100644
--- a/element/manuallyAdd/record.vue
+++ b/element/manuallyAdd/record.vue
@@ -52,7 +52,8 @@
 					<view class="editem" v-if="info&&info.number">
 						<view class="name">{{$t('recordNumber')}}</view>
 						<view class="right">
-							<input type="number" v-model="number" :placeholder="$t('tips.verifyRecord')">{{$t('skip.Number')}}
+							<input type="number" v-model="number"
+								:placeholder="$t('tips.verifyRecord')">{{$t('skip.Number')}}
 						</view>
 					</view>
 				</view>
diff --git a/readme.md b/readme.md
index 4f270b1b..4457798a 100644
--- a/readme.md
+++ b/readme.md
@@ -1 +1,5 @@
-多语言小程序，中文版包括所有功能，英文版简洁版，无卡片，估分，跳绳，肺活量，资讯，和模式选择
\ No newline at end of file
+<<<<<<< HEAD
+app端+身体数据+跳绳+肺活量卡片
+=======
+多语言小程序，中文版包括所有功能，英文版简洁版，无卡片，估分，跳绳，肺活量，资讯，和模式选择
+>>>>>>> 741f1460e936929669c02b1366b2eb1f0520edf4