Merge branch 'dev' into send_coupon

peng

2 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 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;