diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/CreateWarehouseReceiptDto.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/CreateWarehouseReceiptDto.java index 241b6a3c..ee6cfb87 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/CreateWarehouseReceiptDto.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/CreateWarehouseReceiptDto.java @@ -51,6 +51,6 @@ public class CreateWarehouseReceiptDto extends OrgCommonDto { @Comment("领用人") - private String user; + private String lyuser; } diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/UpdateWarehouseReceiptDto.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/UpdateWarehouseReceiptDto.java index 18465d2f..bd77e078 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/UpdateWarehouseReceiptDto.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/UpdateWarehouseReceiptDto.java @@ -51,5 +51,5 @@ public class UpdateWarehouseReceiptDto extends OrgCommonDto { @Comment("领用人") - private String user; + private String lyuser; } diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptDto.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptDto.java index 47c59129..80ef4585 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptDto.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptDto.java @@ -78,5 +78,5 @@ public class WarehouseReceiptDto extends OrgCommonDto { @Comment("领用人") - private String user; + private String lyuser; } diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptSimpleDto.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptSimpleDto.java index 88a3ce7d..3756474c 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptSimpleDto.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptSimpleDto.java @@ -63,5 +63,5 @@ public class WarehouseReceiptSimpleDto extends OrgCommonDto { @Comment("领用人") - private String user; + private String lyuser; } diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/entity/WarehouseReceiptEntity.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/entity/WarehouseReceiptEntity.java index 052f12b9..9a2d0fb7 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/entity/WarehouseReceiptEntity.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/entity/WarehouseReceiptEntity.java @@ -76,7 +76,7 @@ public class WarehouseReceiptEntity extends OrgCommonEntity { @Comment("领用人") - private String user; + private String lyuser; @Comment("归档状态") @ColumnDefault("'0'")