From 91b92422716cb4c5d0433f77fd2d6d45a69639c4 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期二, 15 八月 2023 18:35:17 +0800 Subject: [PATCH] # 工资表配置表 联调修改 --- server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java index 830af01..174a563 100644 --- a/server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java +++ b/server/src/main/java/doumeemes/dao/ext/vo/BomExtListVO.java @@ -60,8 +60,8 @@ @ExcelColumn(name="鍏徃绾х粍缁囩紪鐮侊紙鍏宠仈department琛級") private Integer departId; - @ApiModelProperty(value = "鐗╂枡ID锛堝叧鑱攎aterial琛級", example = "1") - @ExcelColumn(name="鐗╂枡ID锛堝叧鑱攎aterial琛級") + @ApiModelProperty(value = "鐗╂枡ID锛堣瀛楁鍏宠仈 material_distribute 琛↖D 锛侊紒锛侊紒 锛�", example = "1") + @ExcelColumn(name="鐗╂枡ID锛堝叧鑱攎aterial_distribute琛級") private Integer materialId; @ApiModelProperty(value = "鐗堟湰鍙�") @@ -157,5 +157,6 @@ @ApiModelProperty(value = "宸ュ簭鍚嶇О") private String procedureName; - + @ApiModelProperty(value = "material id") + private Integer realMaterialId; } -- Gitblit v1.9.3