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

peng

9 天以前 5100e0fe44f260d81b7416d0de46962926709cab

 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;