Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeAccountStaffMapper.xml

@@ -130,10 +130,11 @@
     <select id="feeDetail" resultType="com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDetailDTO">
         select
         count(distinct staff_id) interceptUserNum,
-        expire_time interceptTime
+        DATE_FORMAT( expire_time, '%Y-%m-%d' ) interceptTime
         from tab_haoban_qywx_fee_account_staff
         where wx_enterprise_id = #{wxEnterpriseId}
         and DATE_SUB(CURDATE(), INTERVAL 30 DAY)  <![CDATA[ <= ]]> date(expire_time)
+        group by DATE_FORMAT( expire_time, '%Y-%m-%d' )
     </select>