Merge branch 'develop'

king

2023-04-03 2b46797c3a5868f7f26329da5834c13aae07ad69

 src/assets/css/viewstyle.scss

@@ -312,17 +312,7 @@
  .system-color {
    color: $color6;
  }
  
  .ant-timeline.system {
    .ant-timeline-item-tail {
      border-color: $color2;
    }
  }
  .mk-time-line-wrap.system {
    .mk-timeline-item-tail {
      border-color: $color2;
    }
  }

  .custom-tab-form-box .mk-normal-form-title.mkbtn {
    .form-title {
      color: $color6;