Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HManagement/siteManage/systemRemind/components/edit.vue

@@ -23,6 +23,8 @@
                 <el-option label="短信" value="短信"></el-option>
                 <el-option label="邮件" value="邮件"></el-option>
                 <el-option label="弹框" value="弹框"></el-option>
+                <el-option label="微信公众号" value="微信公众号" v-if="data.cansendbywechatservice"></el-option>
+                
               </el-select>
             </el-form-item>
           </el-col>