Merge branch 'master' into bms

king

2021-11-18 ada4722b4f0b458305e1f754c62f9df829dfcb24

 src/menu/components/share/markcomponent/markform/index.scss

@@ -1,9 +1,4 @@
.normal-table-mark-form {
  .anticon-question-circle {
    color: #c49f47;
    position: relative;
    left: -3px;
  }
  .color-sketch-block {
    position: relative;
    top: 5px;