Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

2022-07-19 09:43:58 +08:00 · 2022-07-19 09:43:58 +08:00 · a99f4fcbf3
parent f1de4b860e caf80caeff
commit a99f4fcbf3
1 changed files with 165 additions and 161 deletions
--- a/front/src/views/newHome/components/PopularAbility.vue
+++ b/front/src/views/newHome/components/PopularAbility.vue
@ -307,6 +307,10 @@
                  color: #212121;
                  line-height: 0.24rem;
                  height: 1rem;
+  <<<<<<< HEAD
+  =======
+                  word-break: break-all;
+  >>>>>>> caf80caeffc467a237900c464204e8f426e3e6e6
                  overflow: hidden;
                }
              }