diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/OrderDetail.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/OrderDetail.java index c0abe7e..465a786 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/OrderDetail.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/OrderDetail.java @@ -32,15 +32,21 @@ public class OrderDetail implements Serializable { private java.lang.Long id; /**主单id*/ @ApiModelProperty(value = "主单id") + @JsonSerialize(using = ToStringSerializer.class) private java.lang.Long orderId; /**产品id*/ @Excel(name = "产品id", width = 15) @ApiModelProperty(value = "产品id") + @JsonSerialize(using = ToStringSerializer.class) private java.lang.Long goodsId; /**产品名称*/ @Excel(name = "产品名称", width = 15) @ApiModelProperty(value = "产品名称") private java.lang.String goodsName; + /**价格*/ + @Excel(name = "价格", width = 15) + @ApiModelProperty(value = "价格") + private java.math.BigDecimal price; /**产品数量*/ @Excel(name = "产品数量", width = 15) @ApiModelProperty(value = "产品数量") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/ext/OrderDetailExt.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/ext/OrderDetailExt.java index 2c5a6f2..69ed28d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/ext/OrderDetailExt.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/ext/OrderDetailExt.java @@ -13,5 +13,4 @@ public class OrderDetailExt extends OrderDetail { private java.lang.String category; private java.lang.String unit; private java.lang.String url; - private java.math.BigDecimal price; } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/xml/OrderDetailMapper.xml b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/xml/OrderDetailMapper.xml index c52c465..f873a4f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/xml/OrderDetailMapper.xml +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/xml/OrderDetailMapper.xml @@ -16,7 +16,7 @@