Merge remote-tracking branch 'origin/master'

JiangYouYao

2022-03-15 bbc374ae6a80b111bb9d3056a065d8c5f6cd143e

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