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

935090232@qq.com

2021-01-16 79553cb3db14cb9b86fbb0d6aa767b16c786d2fb

 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml

@@ -947,7 +947,6 @@
         sum(IFNULL(free_consume, 0)) freeConsume,
         sum(IFNULL(proj_percentage, 0)) projCommission
      from achieve_new a
      left join sys_order b on a.beault_id=b.STAFF_ID and (date_format(b.ORDER_TIME, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(b.ORDER_TIME, '%Y-%m-%d'))
      where a.beault_id=#{userId} and a.order_type = '订单'
      and (date_format(datatime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(datatime, '%Y-%m-%d'))
   </select>