Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java

@@ -246,4 +246,9 @@
      return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);

   }



   @Override

   public List<LostOrder> listByStateAndResultCode(int state, int resultCode, int page, int pageSize) {

      return lostOrderMapper.listByStateAndResultCode(state, resultCode, (page - 1) * pageSize, pageSize);

   }



}