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

peng

8 天以前 fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10

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

@@ -159,6 +159,7 @@

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


    private String memberId;