Merge branch 'crm15.5' into debug

src/views/ssbg/components/calendar.vue

@@ -69,7 +69,7 @@ function getPopoverContent(){
     }]
     //根据ActivityType判断是什么类型,根据RoadshowType展示对应信息
     const {ActivityType,RoadshowType} = selectEventInfo.value
-    const {Province,City} = selectEventInfo.value
+    const {Province,City,District} = selectEventInfo.value
     //ActivityType为路演时，需要显示的内容
     const {RoadshowPlatform,CompanyName} = selectEventInfo.value
     const RoadshowContent = [{
@@ -80,7 +80,7 @@ function getPopoverContent(){
     },{
         key:'RoadshowCity',
         label:'路演城市：',
-        content:`${Province}${City}`,
+        content:`${Province}${City}${District}`,
         RoadshowType:'线下'
     },{
         key:'CompanyName',