合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -321,7 +321,7 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0议事大厅,1是邻里互助 ,2是二手/租赁,3其它话题"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0议事大厅,1是邻里互助 ,2是二手/租赁,3其它话题,status:"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -1152,7 +1152,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             roomInfoList.add(roomInfo.getPhaseName()
             +roomInfo.getBuildingName()
             +roomInfo.getUnitName()
-            +roomInfo.getLevelName());
+            +roomInfo.getLevelName()
+            +roomInfo.getRoomNoName());
         }
         Map<String, Object> map = Maps.newHashMap();
         /*当前房产信息*/

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

@@ -181,7 +181,7 @@ export default {
 
 }
 .activityTile{
-  font-size: 5px;
+  font-size: 14px;
 }
 .activityContext{
   margin-bottom: 20px;

VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue

@@ -44,7 +44,6 @@
         </div>
       </el-form-item>
       <el-form-item>
-        <el-button @click="resetForm('ruleForm','2')">存为草稿</el-button>
         <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
       </el-form-item>
     </el-form>