Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -301,4 +301,19 @@ public class OrderItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "商品描述")
 	private String itemDescription;
+	/**
+	 * 保险
+	 */
+	@ApiModelProperty(value = "保险")
+	private BigDecimal insurance;
+	/**
+	 * 运费
+	 */
+	@ApiModelProperty(value = "运费")
+	private BigDecimal freight;
+	/**
+	 * 折扣
+	 */
+	@ApiModelProperty(value = "折扣")
+	private BigDecimal discount;
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/OrderItems.java

@@ -280,4 +280,19 @@ public class OrderItems extends OrderBase {
 	 */
 	@ApiModelProperty(value = "商品描述")
 	private String itemDescription;
+	/**
+	 * 保险
+	 */
+	@ApiModelProperty(value = "保险")
+	private BigDecimal insurance;
+	/**
+	 * 运费
+	 */
+	@ApiModelProperty(value = "运费")
+	private BigDecimal freight;
+	/**
+	 * 折扣
+	 */
+	@ApiModelProperty(value = "折扣")
+	private BigDecimal discount;
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.xml

@@ -49,6 +49,9 @@
         <result column="item_prop" property="itemProp"/>
         <result column="if_tax" property="ifTax"/>
         <result column="item_description" property="itemDescription"/>
+        <result column="insurance" property="insurance"/>
+        <result column="freight" property="freight"/>
+        <result column="discount" property="discount"/>
     </resultMap>
 
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.xml

@@ -48,6 +48,9 @@
         <result column="item_prop" property="itemProp"/>
         <result column="if_tax" property="ifTax"/>
         <result column="item_description" property="itemDescription"/>
+        <result column="insurance" property="insurance"/>
+        <result column="freight" property="freight"/>
+        <result column="discount" property="discount"/>
     </resultMap>