From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001 From: 李旭东 <woaiguo66@sina.com> Date: 星期五, 08 十二月 2023 13:29:07 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/mixingstationstorage/entity/MinXingPlantVo.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/mixingstationstorage/entity/MinXingPlantVo.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/mixingstationstorage/entity/MinXingPlantVo.java index 145f97a..977222e 100644 --- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/mixingstationstorage/entity/MinXingPlantVo.java +++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/mixingstationstorage/entity/MinXingPlantVo.java @@ -27,7 +27,7 @@ private Integer byId;//序号 @Excel(sort = 1,title = "入库时间") - private String createDate;//字符串的入库时间 + private Date createDate;//字符串的入库时间 @Excel(sort = 2,title = "供应商") private String supplierName;//供应商名称 @@ -43,4 +43,17 @@ @Excel(sort = 6,title = "入库人") private String username; + + + private String id; + private Integer type; + private Integer opType; + private String materialName; + private double materialValue; + private double beforeStock; + private double afterStock; + private String remark; + private String pipeId; + private String pipeNum; + } -- Gitblit v1.9.3