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

admin

2019-11-29 32f8ab2806fb088335e24983477f5179064ada9d

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/MsgOrderDetailServiceImpl.java

@@ -67,7 +67,7 @@
         }



      } finally {

         jedisPool.returnResource(jedis);

         jedis.close();

      }



   }