Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

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

@@ -107,9 +107,6 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     @Qualifier("phoneCodeImpl")
     private ICode iCode;
-
-    @Autowired
-    private TaUserFeignService taUserFeignService;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     

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

@@ -1,9 +1,9 @@
 
 <template>
   <div id="root">
-    <el-form :inline="true" :model="listQuery" label-width="50px" class="form-inline">
+    <el-form :inline="true" :model="listQuery" label-width="80px" class="form-inline">
       <el-form-item label="活动编号">
-        <div>公告标题&nbsp;&nbsp;<el-input v-model="listQuery.id" placeholder="活动编号" style="width: 80%;padding-left:3.5%"/></div>
+        <el-input v-model="listQuery.id" placeholder="活动编号"/>
       </el-form-item>
       <el-form-item label="活动标题">
         <el-input v-model="listQuery.activityTitle" placeholder="活动标题"/>

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

@@ -8,7 +8,7 @@
          <el-option label="议事大厅" value="0"/>
          <el-option label="友令互助" value="1"/>
          <!-- -1包括，二手，租赁，求购 -->
-         <el-option label="二手租赁" value="-1"/>
+         <el-option label="二手租赁" value="2"/>
          <el-option label="其他" value="3"/>
         </el-select>
         </div>