diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java index 64b4e14a..2c6cb000 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java @@ -412,6 +412,6 @@ public class WaresParams implements Serializable { /** * 商品上传盒数 */ - private BigDecimal boxNum; + private Integer boxNum; } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml index e0769826..250fe8cb 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml @@ -36,6 +36,7 @@ + @@ -50,7 +51,7 @@ be.pk_special_currency,bw.wares_code, bw.wares_name, bd.is_gift is_gift, bd.pk_product,bs.price,bs.achieve,bp.pk_supplier,bp.shipping_channel,bp.product_code, - bs.ass_achieve,b.specs_name,b.specs_name_id + bs.ass_achieve,b.specs_name,b.specs_name_id, bw.box_num from bd_wares bw inner join bd_wares_extend be on bw.pk_id = be.pk_wares diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java index a331f646..71971975 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java @@ -138,4 +138,9 @@ public class BdWaresDetailExt extends BdWaresDetail { */ private Integer pkUnit; + /** + * 商品上传盒数 + */ + private Integer boxNum; + } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java index 92a0521f..3c58acc1 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java @@ -226,6 +226,6 @@ public class BdWares extends BaseEntity { * 商品上传盒数 */ @TableField("BOX_NUM") - private BigDecimal boxNum; + private Integer boxNum; }