diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java index 985188ba..c67c482d 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @@ -14,6 +15,9 @@ public class UserSimpleRespVO { @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; + @Schema(description = "工号", requiredMode = Schema.RequiredMode.REQUIRED, example = "mes") + private String username; + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") private String nickname; diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue index b136c0cb..16b760d4 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue @@ -325,7 +325,6 @@ const formData = ref({ contact3Addr: undefined, status: 1, logo: undefined, - logo: undefined, payType: undefined, accountName: undefined, bankNo: undefined, @@ -347,7 +346,7 @@ const open = async (type: string, id?: number) => { userList.value.forEach((element) => { element.value = element.id - element.label = element.id + element.nickname + element.label = element.username +" "+ element.nickname }) dialogVisible.value = true