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

peng

7 天以前 fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10

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

@@ -153,6 +153,19 @@
    @ApiModelProperty(value = "卖家订单备注")
    private String sellerRemark;

    /**
     * 敏感信息
     */

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


    private String memberId;
    @Setter
    private String nickName;

    public List<OrderItemVO> getOrderItems() {
        if (CharSequenceUtil.isEmpty(groupGoodsId)) {
            return new ArrayList<>();