Merge remote-tracking branch 'origin/master'

admin

2018-12-29 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e

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



}