fix

Helius

2022-05-27 05a82deffa89a22fa35abaa9196053f43cbc1103

 zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java

@@ -14,14 +14,25 @@
    @ApiModelProperty(value = "订单状态 0-全部 1-待付款 2-已付款 3-欠款 4-已取消 全部默认传空字符串", example = "1")
    private Integer orderStatus;

    public Long getVipId() {
        return vipId;
    }

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

    @ApiModelProperty(value = "会员id", example = "1")
    private Long  vipId;

    @ApiModelProperty(hidden = true)
    private String status;

    @ApiModelProperty(value = "查询字段")
    private String queryKey;

//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
//    private Date orderTime;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    private Date orderTime;

    public Date getBeginTimeVo() {
        return beginTimeVo;
@@ -51,13 +62,13 @@
    @ApiModelProperty(hidden = true)
    private Long companyId;

//    public Date getOrderTime() {
//        return orderTime;
//    }
//
//    public void setOrderTime(Date orderTime) {
//        this.orderTime = orderTime;
//    }
    public Date getOrderTime() {
        return orderTime;
    }

    public void setOrderTime(Date orderTime) {
        this.orderTime = orderTime;
    }

    public Long getCompanyId() {
        return companyId;