Merge branch 'developer' into alpha

Helius

2022-03-15 1c04c6a9607b7d4543989c73a1ae91274bbb167c

 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;
   }
}