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

peng

6 天以前 211b5a717de92b9b52879280ca2285cdd0b4a54b

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

@@ -156,8 +156,15 @@
    /**
     * 敏感信息
     */

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


    private String memberId;
    @Setter
    private String nickName;

    public List<OrderItemVO> getOrderItems() {
        if (CharSequenceUtil.isEmpty(groupGoodsId)) {