hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-24 07:45:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

Browse Source 
 Conflicts:
	src/views/infra/build/index.vue
	src/views/mall/product/spu/components/DescriptionForm.vue
	src/views/mall/product/spu/components/OtherSettingsForm.vue
	src/views/mall/product/spu/components/ProductPropertyAddForm.vue
	src/views/mall/product/spu/components/SkuList.vue
This commit is contained in:
YunaiV
2023-06-23 13:54:43 +08:00
parent 91c53e2e3f c1a4edf7b1
commit b159240824
298 changed files with 1253 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
View File

@ -137,7 +137,7 @@
</template>
</Dialog>
</template>
<script setup lang="ts">
<script lang="ts" setup>
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as DeliveryExpressTemplateApi from '@/api/mall/trade/delivery/expressTemplate'
import { defaultProps } from '@/utils/tree'