Compare commits

..

No commits in common. "20f647105d9ece8ec6cd9985afb2dc5c2d0b1deb" and "26053da65e5195d92cde33b0eec44d2d499c4602" have entirely different histories.

2 changed files with 0 additions and 9 deletions

View File

@ -301,8 +301,6 @@ 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()));
}

View File

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