Browse Source

新下单流程优化

lishiqiang 1 month ago
parent
commit
c4a3a92c62

+ 8 - 3
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/audituser/vo/AuditUserRespVO.java

@@ -1,5 +1,7 @@
 package com.yc.ship.module.trade.controller.admin.audituser.vo;
 
+import com.yc.ship.framework.excel.core.annotations.DictFormat;
+import com.yc.ship.framework.excel.core.convert.DictConvert;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -13,17 +15,20 @@ import com.alibaba.excel.annotation.*;
 public class AuditUserRespVO {
 
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24108")
-    @ExcelProperty("主键")
     private Long id;
 
     @Schema(description = "审核类型 1、1级审核 2、2级审核 3、3级审核 4、4级审核", example = "1")
-    @ExcelProperty("审核类型 1、1级审核 2、2级审核 3、3级审核 4、4级审核")
+    @ExcelProperty(value = "审核类型", converter = DictConvert.class)
+    @DictFormat("trade_audit_type")
     private Integer type;
 
     @Schema(description = "审核人")
-    @ExcelProperty("审核人")
     private Long auditUser;
 
+    @Schema(description = "审核人")
+    @ExcelProperty("审核人")
+    private String auditUserName;
+
     @Schema(description = "当前审核阶段 1、1级审核 2、2级审核 3、3级审核 4、4级审核", example = "1")
     private Long auditStatus;