Merge branch 'crm15.5' into debug

src/views/ssbg/roadshow/rsCalendar.vue

@@ -157,12 +157,12 @@ onMounted(() => {
 /* 选择研究员 */
 const slectResearcherHandle = () => {
   // console.log('slect');
-  if(state.selectResearcher) {
+  /* if(state.selectResearcher) {
     rs_picker.value = {
       firstindex: findParentByid(state.selectResearcher,researcherArr.value),
       id: state.selectResearcher
     }
-  }
+  } */
   isResearcherPicker.value = true;
 };