Merge remote-tracking branch 'origin/bd_dev' into bd_dev

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java

@@ -301,6 +301,8 @@ public class SaOrderController extends ParentOrderController {
             if (StringUtils.isNotBlank(waresOrderVo.getOperateScope())) {
                 waresOrderVo.setOperateScope(ESupplyWay.getLabelByVal(Integer.parseInt(waresOrderVo.getOperateScope())));
             }
+            // 商品类型
+            waresOrderVo.setIsMakerGiftVal(EWaresType.getLabelByValue(waresOrderVo.getIsMakerGift()));
             // 发货类型
             waresOrderVo.setShippingChannelStr(EShippingChannel.getLabelByValue(waresOrderVo.getShippingChannel()));
         }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java

@@ -292,6 +292,13 @@ public class WaresOrderInfoVo implements Serializable {
      */
     private Integer systemType;
 
+    /**
+     * 商品类型
+     */
+    private Integer isMakerGift;
+    @Excel(name = "商品类型")
+    private String isMakerGiftVal;
+
     /**
      * 创建时间
      */