+ Fixed issue in autoCode/index.vue file that make building fail.
This commit is contained in:
parent
0f1407ebfe
commit
cad98da84c
|
@ -853,13 +853,9 @@
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-upload
|
<el-upload
|
||||||
:before-upload="importJson"
|
:before-upload="importJson"
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
:show-file-list="false"
|
:show-file-list="false"
|
||||||
>>>>>>> main
|
|
||||||
accept=".json"
|
accept=".json"
|
||||||
class="flex items-center"
|
class="flex items-center"
|
||||||
show-file-list="false"
|
|
||||||
>
|
>
|
||||||
<el-button class="mx-2" type="primary" :disabled="isAdd">{{
|
<el-button class="mx-2" type="primary" :disabled="isAdd">{{
|
||||||
t('view.systemTools.autoCode.importJson')
|
t('view.systemTools.autoCode.importJson')
|
||||||
|
|
Loading…
Reference in New Issue