From 5ccc7a53194dd3c5eb00d6dfa5cd39d8c92f0530 Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Wed, 28 Jul 2021 16:58:42 +0800
Subject: [PATCH] chore: merge wrr

---
 CHANGELOG.md                                     | 13 +++----------
 src/components/TimeLine/component/TimeStatus.vue |  1 +
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6abcb8..2eaefde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,13 +69,6 @@
  - | 时间轴上下滚动数据加载bug修改 | e82ede4
  - | 时间轴插件 | 225d3cc
  - | 时间轴骨架屏修改 | ca78d02
- - | 修改main | 749ae9a
- - | 修改角色栏组件 | a54c601
- - | 定期任务接口 | aa4981c
- - | 提示信息显示bug及日常任务收缩问题 | f2f06c5
- - | 时间轴上下滑动 | 4d0ae46
- - | 时间轴上下滚动数据加载bug修改 | e82ede4
- - | 时间轴插件 | 225d3cc
  - | 角色栏修改 | 19228d6
  - | 解决时间轴报错 | da1eece
  - | 骨架屏替换 | e9fdd71
@@ -93,6 +86,7 @@
  - | project 代码健壮性完善 | a3202c5
  template | eslint prettier sass uview tailwindcss | 9c966a1
  - | 下滑时间轴添加备注 | 4fd20e3
+ - | 界面样式调整 | 4367249
 
 
 ### 🚀 性能优化
@@ -119,9 +113,7 @@
  - | uview-ui | a9ea34b
  信息配置 | 配置eslint等配置 | 7421443
  - | 修复不能build的问题 | 0b7b91e
- pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | 875fab4
- - | uview-ui | a9ea34b
- 信息配置 | 配置eslint等配置 | 7421443
+ - | 删除多余的构建的命令 | 3f4eb2f
 
 
 范围|描述|commitId
@@ -129,3 +121,4 @@
  - | style:index | 978f272
  - | !2 基础模板v1.1.0 | f5e61dd
  - | init | c0f1deb
+
diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue
index 12dfa23..342b3e7 100644
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@@ -105,6 +105,7 @@ export default {
   },
 };
 </script>
+
 <style scoped lang="scss">
 .icon-column {
   height: 33px;