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

Helius

2020-12-27 3eb52981c3e97af186174d7eacbcb7ec0c5f8739

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

@@ -37,7 +37,6 @@
   /**
    * 收款
    */
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GTM-8")
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private Date payTime;