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

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

 zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "订单ID")
    private String orderId;

    @ApiModelProperty(value = "会员ID")
    private String vipId;

    @ApiModelProperty(value = "会员姓名")
    private String vipName;

@@ -59,6 +62,13 @@
    @ApiModelProperty(value = "下单时间")
    private Date orderTime;

    public String getVipId() {
        return vipId;
    }

    public void setVipId(String vipId) {
        this.vipId = vipId;
    }

    public Date getOrderTime() {
        return orderTime;