Merge branch 'yb11.1'

src/views/custom_manage/customList/updateServe.vue

@@ -896,7 +896,7 @@ export default {
 		setmealChange(){
 			if(this.dataForm.setmeal == '1'){
 				this.authList.forEach(item => {
-					if(item.ClassifyName != '市场策略') {
+					if(!['市场策略','固定收益'].includes(item.ClassifyName)) {
 						item.Items.forEach(key => {
 							item.CheckList.push(key.ChartPermissionId)
 							key.Checked = true