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

admin

2019-08-03 c41081c9b049e5a1b370a7a77bff0d2cafdbd289

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

@@ -87,7 +87,7 @@
      update.setPayMoney(detail.getPayMoney());

      if (detail.getState().intValue() != msg.getState()) {

         update.setState(detail.getState());

         update.setUpdateTime(new Date());

//         update.setUpdateTime(new Date());

         if (needNotify)

            userMsgReadStateService.addOrderMsgUnReadCount(detail.getUser().getId(), 1);

      }