Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/log/LogHelper.java

@@ -171,11 +171,12 @@
         ps.flush();

         ps.close();

      } catch (Exception e1) {

			


      } finally {

         try {

            out.close();

         } catch (IOException e1) {

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }