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

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

@@ -141,7 +141,7 @@
 		from music_group_payment_calender_member order by id_ DESC) mgpcm
 		ON mc.calender_id_ = mgpcm.calender_id_
 		set orc.start_date_ = mc.start_date_,orc.end_date_ = mgpcm.end_date_
-		where orc.calender_id_ = mc.calender_id_
+		where orc.calender_id_ = mc.calender_id_ AND orc.month_flag_ = 0
 	</update>
 
     <!-- 根据主键删除一条记录 -->