Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 8d4c67323bee47d6225f150e9f61868c6434a358

 src/views/tms/modules/baseTools/ParaBladeSearchModal.vue

@@ -221,7 +221,7 @@
                type="list"
                v-model="model.inOutThread"
                :triggerChange="true"
                dictCode="in_out_thread"
                dictCode="number_patterns"
                placeholder="请选择内外螺纹"
              />
            </a-form-model-item>
@@ -232,7 +232,7 @@
                type="list"
                v-model="model.threadStandard"
                :triggerChange="true"
                dictCode="thread_standard"
                dictCode="tool_thread_standard"
                placeholder="请选择螺纹标准"
              />
            </a-form-model-item>