Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-25 0eb83b49a381c31a51b8c8cec9e4d9d88fd5d16f

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

@@ -1,5 +1,8 @@
package com.matrix.system.hive.bean;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.tools.DateUtil;

import java.util.Date;
import java.io.Serializable;
/**
@@ -65,6 +68,7 @@
   /**
    * 创建时间
    */
   @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS, timezone = "GMT+8")
   private Date  createtiem;