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

admin

2019-12-14 1261c227e7ad47607ee651bbd017ea80eb6d044a

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

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



      } finally {

         jedisPool.returnResource(jedis);

         jedis.close();

      }



   }