Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

zhangxiao

2024-09-02 432d47bd7fa2eac4f084f7f1dfdef452de760ae8

 src/views/dmx/setting/components/custom-settings.vue

@@ -230,7 +230,7 @@
  .list-wrap{
    position: relative;

    ::v-deep .block-title{
    .block-title{
      height: 36px;
      lin-height: 36px;
    }