Merge branch 'ty_fix' into alpha

Helius

2021-11-08 ad3f115b29e3c33b32bd38855bdc5b9f2de381b1

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

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

import com.matrix.core.pojo.EntityDTO;
import com.matrix.system.hive.plugin.util.DateUtils;
import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
@@ -34,7 +34,7 @@
   /**
    * 出库时间
    */
   @DateTimeFormat(pattern= DateUtils.DATE_FORMAT_MM)
   @DateTimeFormat(pattern= DateUtil.DATE_FORMAT_MM)
   private Date time;

   /**