gaoluyang
2026-05-12 ed049a5871fc7779eab84e986ff949c7d09c9c91
Merge remote-tracking branch 'origin/dev_浪潮' into dev_浪潮

# Conflicts:
# src/views/salesManagement/returnOrder/components/formDia.vue
已修改1个文件
2 ■■■ 文件已修改
src/views/salesManagement/returnOrder/components/formDia.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/returnOrder/components/formDia.vue
@@ -170,7 +170,7 @@
import { returnManagementAdd, returnManagementUpdate, returnManagementGetByShippingId, getSalesLedger, returnManagementGetById } from "@/api/salesManagement/returnOrder.js";
import useUserStore from "@/store/modules/user.js";
import { userListNoPageByTenantId } from "@/api/system/user.js";
import { listProject } from "@/api/projectManagement/project";
import { listProject } from "@/api/projectManagement/project.js";
import {listCustomer} from "@/api/basicData/customer.js";
const { proxy } = getCurrentInstance();