Merge remote-tracking branch 'origin/master'

zhaowei

8 天以前 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946

 src/views/mdc/base/DeviceParamThresholdManagement.vue

@@ -25,6 +25,7 @@
                :data-source="driveTypeList"
                placeholder="请选择控制系统类型"
                :filter-option="filterOption"
                :allowClear="true"
              />
            </a-form-item>
          </a-col>