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

CODE/smart-community/app-api/src/main/resources/mapper/TpRentalHouseMapper.xml

@@ -511,7 +511,7 @@
     <where>
 
       <if test="houseName !=null and houseName != ''" >
-        AND rh.community_address like concat('%',#{houseName},'%')
+        AND rh.house_name like concat('%',#{houseName},'%')
       </if>
       <if test="rentalType == 1" >
         and rh.rental_type = '1'

CODE/smart-community/app-api/src/main/resources/mapper/TpShopMapper.xml

@@ -281,7 +281,7 @@
   </select>
 
   <select id="selectShopCommunity" resultMap="ResultMapWithBLOBs">
-    select * from tp_shop WHERE community_id = #{communityId} order by sort desc LIMIT 4
+    select * from tp_shop WHERE community_id = #{communityId} and shop_status = 1  order by sort desc LIMIT 4
   </select>
 
 </mapper>

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomAdd.vue

@@ -49,7 +49,7 @@ export default {
           { required: true, message: '请输入房型描述', trigger: 'blur' }
         ],
         price: [
-          { required: true, message: '请输入房型描述', trigger: 'blur' }
+          { required: true, message: '请输入价格', trigger: 'blur' }
         ],
         roomStatus: [
           { required: true, message: '请选择状态', trigger: 'blur' }