Merge branch 'master' into div1

yujian

2018-12-29 2dff570ccfa532f8c012bc13829b302dd3e1b9d3

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java

@@ -94,6 +94,7 @@
    * @param endTime

    * @return

    */

   public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime);

   public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,

         String endTime, Integer day);



}