Merge branch 'send_coupon' into user_action

peng

3 天以前 e46e620ea7afd8b18aa24dde8e3c9564355fa14f

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

@@ -156,8 +156,15 @@
    /**
     * 敏感信息
     */

    private String consigneeName;
    private String consigneeMobile;
    private String modifyAddressFlag;


    private String memberId;
    @Setter
    private String nickName;

    public List<OrderItemVO> getOrderItems() {
        if (CharSequenceUtil.isEmpty(groupGoodsId)) {