Merge branch 'release-0612' into 'release'

Release 0612



See merge request !47

src/style/patient-manager/labels-manager/labels-list.less

@@ -29,7 +29,7 @@
     border: 1px solid #efefef;
     border-radius: 4px;
     overflow: hidden;
-    overflow-y: scroll; 
+    overflow-y: scroll;
     padding: 20px 10px;
     .each-label{
       margin: 0 10px 10px 0;
@@ -42,13 +42,13 @@
         cursor: pointer;
       }
     }
-    /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/  
-    &::-webkit-scrollbar  
-    {  
-        width: 5px;  
-        height: 5px;  
-        background-color: #fff;  
-    }  
+    /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
+    &::-webkit-scrollbar
+    {
+        width: 5px;
+        height: 5px;
+        background-color: #fff;
+    }
     /*定义滚动条轨道 内阴影+圆角*/
     &::-webkit-scrollbar-track
     {
@@ -65,7 +65,7 @@
     }
   }
   .table-empty{
-    width: 100%; 
+    width: 100%;
     height: auto;
     text-align: center;
     .empty-pic{