Merge remote-tracking branch 'origin/master'
# Conflicts: # src/api/jyh/index.ts # src/components/AdvanceSearch/index.vue
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
<d-form :layout="props.layout" :label-align="'end'">
|
||||
<d-row :gutter="16">
|
||||
<d-col :span="8">
|
||||
<d-form-item field="name" label="软件/组件名称">
|
||||
<d-input placeholder="请输入软件/组件名称" v-model="formData.searchWord"/>
|
||||
<d-form-item field="name" label="软件名称">
|
||||
<d-input placeholder="请输入软件名称" v-model="formData.searchWord"/>
|
||||
</d-form-item>
|
||||
</d-col>
|
||||
<d-col :span="8">
|
||||
|
||||
Reference in New Issue
Block a user