Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

# Conflicts:
#	src/components/MainSuit/index.jsx

src/store/actions/currentIll.js

@@ -76,7 +76,7 @@ export const setData = (state,action) =>{
   let mainLabelModuleArr = objToArr.filter((item)=>{
     return item.questionMapping.length>0;
   })
-  
+  console.log(444,mainLabelModuleArr);
   if (useEmpty) {
     res.data = res.emptyData;
   } else {