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

peng

4 天以前 40d3bb9fe638a0bd79e829e7fd5114871101390b

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

@@ -159,6 +159,8 @@

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


    private String memberId;