Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/jyh/index.ts

src/views/Jyh/Home/index.vue

@@ -59,7 +59,7 @@
         <div class="info-title">
           <div class="sub-title">
             <img src="@/assets/imgs/home/informIcon@2x.png">
-            <span>信息公示</span>
+            <span>预警公告</span>
           </div>
           <a class="devui-link" @click="checkMore">更多 ></a>
         </div>
@@ -89,7 +89,7 @@
     </div>
   </div>
 
-  <d-modal class="warning-modal" v-model="warningModalVisable" title="主题：" style="width: 600px;">
+  <d-modal class="warning-modal" v-model="warningModalVisable" title="" style="width: 600px;">
     <EarlyWarningDetail :warningData="currentWarning" :type="'user'"></EarlyWarningDetail>
   </d-modal>
 </template>