Merge branch 'dev-lqc' into test

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashScheduleTaskListMapper.xml

@@ -120,7 +120,7 @@
             SELECT
                 count(*)
             FROM
-            ( SELECT type FROM pan_fosterwx_cash_schedule_task_list task_list GROUP BY task_list.schedule_id, task_list.template_id, task_list.task_id, task_list.group_id, task_list.type, task_list.send_time ) task_list
+            ( SELECT task_list.schedule_id, task_list.template_id, task_list.task_id, task_list.group_id, task_list.type, task_list.send_time FROM pan_fosterwx_cash_schedule_task_list task_list GROUP BY task_list.schedule_id, task_list.template_id, task_list.task_id, task_list.group_id, task_list.type, task_list.send_time ) task_list
             <where>
                 ${ew.sqlSegment}
             </where>