Merge remote-tracking branch 'origin/master'

admin

2018-12-29 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e

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

@@ -166,7 +166,11 @@
                        orderProcessService.processOrder(map);

                     }

                  } catch (Exception e) {

                     try {

                        LogHelper.errorDetailInfo(e);

                     } catch (Exception e1) {



                     }

                  }

               }

            }