Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/pages/app/wechat/reply/follow.vue

@@ -92,11 +92,13 @@
                       </Select>
                     </FormItem>
                     <FormItem label="消息内容：" prop="content" v-if="formValidate.type === 'text'">
-                      <textarea
+                      <Input
                         v-model="formValidate.data.content"
                         placeholder="请填写消息内容"
                         style="width: 90%"
-                      ></textarea>
+                        type="textarea"
+                        :rows="4"
+                      ></Input>
                     </FormItem>
                     <FormItem label="选取图文：" v-if="formValidate.type === 'news'">
                       <Button type="info" @click="changePic">选择图文消息</Button>

template/admin/src/pages/system/group/visualization.vue

@@ -1792,6 +1792,7 @@ export default {
   padding: 20px;
   background-color: #fff;
   border-radius: 5px;
+  min-height: 600px;
 }
 
 .iview-video-style {

template/admin/src/pages/user/label/index.vue

@@ -282,7 +282,7 @@ export default {
 }
 
 .left-wrapper {
-  height: 904px;
+  height: 920px;
   background: #fff;
   border-right: 1px solid #f2f2f2;
 }