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

zxl

4 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

 framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java

@@ -160,6 +160,12 @@
    @ApiModelProperty(value = "是否是礼品卡")
    private String couponFlag;

    /**
     * @see cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum
     */
    @ApiModelProperty(value = "是否是定制商品")
    private String customizeFlag;

    private int i = 0;
    public List<OrderItemVO> initOrderItems() {
        if (CharSequenceUtil.isEmpty(groupGoodsId)) {