Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java

@@ -132,6 +132,11 @@ public class ItembasicController {
         List<ItembasicDO> list = itembasicService.getItembasicList(exportReqVO);
         // 导出 Excel
         List<ItembasicExcelVO> datas = ItembasicConvert.INSTANCE.convertList02(list);
+        for(ItembasicExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, datas);
     }
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportExcelVO.java

@@ -30,9 +30,6 @@ public class ItempackagingImportExcelVO {
 
     @ExcelProperty(value = "包装单位", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.UOM)
-    private String description;
-
-    @ExcelProperty("包装单位")
     private String stdPackUnit;
 
     @ExcelProperty("包装数量")