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

admin

2020-04-29 a358495d588a844d9fb2e3e4a9b6c043274aac68

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



   /**

    * 统计申诉成功订单金额