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

peng

19 小时以前 81aacc9579580351898c5c2f673bcf3f7f0ec8df

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

@@ -153,6 +153,12 @@
    @ApiModelProperty(value = "卖家订单备注")
    private String sellerRemark;

    /**
     * 敏感信息
     */
    private String consigneeName;
    private String consigneeMobile;

    public List<OrderItemVO> getOrderItems() {
        if (CharSequenceUtil.isEmpty(groupGoodsId)) {
            return new ArrayList<>();