Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -1385,7 +1385,7 @@
 				#{organId}
 			</foreach>
 		</if>
-		GROUP BY DATE_FORMAT(spo.pay_time_,'%Y-%m-%d'),spo.organ_id_
+		GROUP BY DATE_FORMAT(spo.pay_time_,'%Y-%m-%d')
 	</select>
 	<select id="getTotalAmountDataWithTimelyDetails" resultMap="IndexBaseMonthData">
 		SELECT spo.organ_id_,SUM(CASE WHEN spo.actual_amount_ IS NULL THEN 0 ELSE spo.actual_amount_ END +