Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-05-14 de32f49313e2c7534009758193c41be61517f1d5

 src/components/panel/LegendPanel.vue

@@ -182,8 +182,10 @@
          margin: 0.05208rem 0;

          img {
            width: .08333rem;
            height: .08333rem;
           // width: .08333rem;
           // height: .08333rem;
            width: 0.1rem;
            height: 0.1rem;
            margin-right: .01042rem;
          }