解决合并冲突

3 years ago · 457d3ad327
parent 478cf73244 d0c191f085
commit 457d3ad327
2 changed files with 2 additions and 2 deletions
--- a/h5/static/js/pages-index-index.e7c4b05d.js
+++ b/h5/static/js/pages-index-index.e7c4b05d.js
--- a/pages/index/components/Pick.vue
+++ b/pages/index/components/Pick.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-23 10:29:07
 * @LastEditors: ch
- * @LastEditTime: 2022-05-03 13:26:28
+ * @LastEditTime: 2022-05-03 13:31:19
 * @Description: file content
 -->
 <template>