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

admin

2020-04-15 d4588f4e43336b26b356b869c29d0c76390167d5

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/LostOrderMapper.java

@@ -47,7 +47,7 @@
    * @param preDay

    * @return

    */

   Integer countLostOrderNum(@Param("preDay") String preDay);

   Integer countLostOrderNum(@Param("preDay") String preDay, @Param("resultCode") int resultCode);



   /**

    * 统计申诉成功订单金额