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

935090232@qq.com

2021-01-06 7b9cb4464cf7a6db758214c5681b0ecdf01e3db4

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java

@@ -47,6 +47,9 @@
    @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
    private Date failTime;


    private Date targetFailTime;
    /**
     * 套餐id
     */
@@ -129,6 +132,14 @@

    private String queryKey;

    public Date getTargetFailTime() {
        return targetFailTime;
    }

    public void setTargetFailTime(Date targetFailTime) {
        this.targetFailTime = targetFailTime;
    }

    public String getQueryKey() {
        return queryKey;
    }