Merge branch 'master' into div

yujian

2019-07-16 b651fb598b4da4ffa734a372e8d1b0b01eeef3fa

 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -369,7 +369,7 @@
                     }

                  }

               } catch (Exception e) {



                  LogHelper.errorDetailInfo(e);

               }

            }

         }