Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 8a7a7e79b63d91d1865bdf2ec38d4e99d2670d69

 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);

      }