Merge branch 'developer' into alpha

Helius

2022-03-10 6678c4c0f42d25e0a63416f4ac5dda3cd66627a7

 zq-erp/src/main/java/com/matrix/core/tools/MatrixFileAppender.java

@@ -17,6 +17,5 @@
   @Override
   public void setFile(String file) {
      String val = file.trim();
      fileName = PropertiesUtil.getString("log_path") + val;
   }
}