合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -398,9 +398,10 @@ public class ToUserServerImpl implements IToUserService {
         ResponseBean response= new ResponseBean<>();
         Page<TaFeedback> page = PageHelper.startPage(pageNum,pageSize);
         List<TaFeedback> phoneList = taFeedbackMapper.getFeedback(content, tel, handleStatus);
-        ArrayList<String>
+        ArrayList<String> img= new ArrayList<>();
         for (TaFeedback taFeedback : phoneList){
-             List<String> String= taFeedbackImgMapper.selectImg(taFeedback.getId());
+             List<String> Img= taFeedbackImgMapper.selectImg(taFeedback.getId());
+            img.add()
         }
 
         Map<String,Object> map = Maps.newHashMap();

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

@@ -22,7 +22,8 @@
         </div>
       </el-form-item>
       <el-form-item>
-        <div>活动详细描述&nbsp;&nbsp;<wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
+        <span style="transform:translateY(700%)">活动详情描述</span>
+       <div style="padding-left:12%;transform:translateY(-15%)"><wangeditor :content="ruleForm.activityContent"/></div>
       </el-form-item> 
       <!-- <el-form-item>
         <div >

VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue

@@ -22,7 +22,8 @@
         </div>
       </el-form-item>
       <el-form-item>
-        <div>活动详细描述&nbsp;&nbsp;<wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
+       <span style="transform:translateY(700%)">活动详情描述</span>
+       <div style="padding-left:12%;transform:translateY(-15%)"><wangeditor :content="ruleForm.activityContent"/></div>
       </el-form-item>
       <!-- <el-form-item >
         <div >

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

@@ -7,7 +7,8 @@
     <img :src="ruleForm.activityCarouselImg" width="100" height="100">
     </div>
     </div>
-    <div>活动详细描述&nbsp;&nbsp;<wangeditor :content="ruleForm.activityContent"/></div>
+    <span style="transform:translateY(500%)">活动详情描述</span>
+    <div style="padding-left:12%"><wangeditor :content="ruleForm.activityContent"/></div>
     <!-- <div>
         <div>
         <div style="transform:translateY(20%);">活动配图</div>