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

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

@@ -8,6 +8,8 @@ import com.community.huiju.model.ToBanner;
 import com.community.huiju.service.BannerServiceI;
 import com.community.huiju.service.MenuServiceI;
 import com.community.huiju.service.MessageServiceI;
+import com.community.huiju.service.TpHotelServicel;
+import com.community.huiju.service.TpShopServicel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -43,6 +45,12 @@ public class AssembleController extends BaseController {
 	@Autowired
 	private MessageServiceI messageService;
 	
+	@Autowired
+	private TpHotelServicel tpHotelServicel;
+	
+	@Autowired
+	private TpShopServicel tpShopServicel;
+	
 	@ApiOperation(value = "首页数据获取接口", notes = "首页数据获取接口")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
@@ -64,11 +72,17 @@ public class AssembleController extends BaseController {
 		List<ToBanner> toBannerList = bannerService.viewAllBannerImg(1);
 		//获取消息总数接口
 		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userElement.getUserVerifyId());
+		//获取当前小区的酒店信息
+		ResponseBean hotelRes = tpHotelServicel.getHotelCommunity(userElement);
+		//获取当前小区的商铺信息
+		ResponseBean shopRes = tpShopServicel.getShopCommunity(userElement);
 		
 		//组装数据
 		indexMap.put("menuList",menuList);
 		indexMap.put("bannerList",toBannerList);
 		indexMap.put("messageTotal",totalMap.get("messageTotal"));
+		indexMap.put("hotelMap",hotelRes.getData());
+		indexMap.put("shopMap",shopRes.getData());
 		indexMap.put("toDoTotal",totalMap.get("toDoTotal"));
 		responseBean.addSuccess(indexMap);
 		return responseBean;

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpRentalHouseMapper.java

@@ -30,5 +30,5 @@ public interface TpRentalHouseMapper {
      * @param priceFluctuate
      * @return
      */
-    List<TpRentalHouse> getRentalHouse(String houseName, Integer rentalType, Integer houseType, Integer rentalPrice, Integer priceFluctuate);
+    List<TpRentalHouse> getRentalHouse(String houseName, Integer rentalType, Integer houseType, Integer rentalPrice, Integer priceFluctuate,Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpRentalHouse.java

@@ -4,177 +4,89 @@ import java.util.Date;
 import java.util.List;
 
 public class TpRentalHouse {
-    /**
-     * ID
-     */
     private Integer id;
 
-    /**
-     * 房间名称
-     */
+    private Integer communityId;
+
     private String houseName;
 
-    /**
-     * 房屋租金
-     */
     private String rentalPrice;
 
-    /**
-     * 面积
-     */
     private String area;
 
-    /**
-     * 出租方式 1 是整租 2是合租
-     */
     private String rentalType;
 
-    /**
-     * 户型 1 是一室居 2是二室居 3 是三室局 4 是四室居及以上
-     */
     private String houseType;
 
-    /**
-     * 上架状态 1 是已上架 2是已下架
-     */
     private String houseStatus;
 
-    /**
-     * 楼层
-     */
     private String houseLevel;
 
-    /**
-     * 标签
-     */
     private String houseLabel;
 
-    /**
-     * 权重
-     */
     private Integer sort;
 
-    /**
-     * 联系电话
-     */
     private String houseTel;
 
-    /**
-     * 小区地址
-     */
     private String communityAddress;
 
-    /**
-     * 小区经度
-     */
     private String communityLongitude;
 
-    /**
-     * 小区纬度
-     */
     private String communityLatitude;
 
-    /**
-     * 床
-     */
     private String bed;
 
-    /**
-     * 衣柜
-     */
+    private String mattress;
+
     private String wardrobe;
 
-    /**
-     * 餐桌
-     */
-    private String diningTable;
+    private String sofa;
 
-    /**
-     *电脑桌
-     */
-    private String computerDesk;
+    private String washingMachine;
 
-    private String waterHeater;
+    private String airConditioning;
 
-    /**
-     * 椅子
-     */
-    private String chair;
+    private String fridge;
 
-    /**
-     * 洗衣机
-     */
-    private String washingMachine;
+    private String tv;
 
-    /**
-     * 空调
-     */
-    private String airConditioning;
+    private String smartLock;
 
-    /**
-     * 台灯
-     */
-    private String tableLamp;
+    private String waterHeater;
+
+    private String desk;
+
+    private String chair;
 
-    /**
-     * 有
-     */
     private String wifi;
 
-    /**
-     * 微波炉
-     */
-    private String microwaveOven;
+    private String kitchen;
 
-    /**
-     * 天然气
-     */
-    private String naturalGas;
+    private String bathroom;
+
+    private String balcony;
 
-    /**
-     * 创建时间
-     */
     private Date createDate;
 
-    /**
-     * 创建人
-     */
     private Integer createUser;
 
-    /**
-     * 更新时间
-     */
     private Date updateDate;
 
-    /**
-     * 更新人
-     */
     private Integer updateUser;
 
-    /**
-     * 房屋介绍
-     */
     private String houseIntroduction;
 
     /**
-     * 出租房屋首页列表图片
+     * 便签数组
      * @return
      */
-    private String homeImg;
+    private List<String> houseLabelArr;
 
     /**
-     * 标签数组
+     * banner图
      * @return
      */
-    private List<String> houseLabelArr;;
-
-    public List<String> getHouseLabelArr() {
-        return houseLabelArr;
-    }
-
-    public void setHouseLabelArr(List<String> houseLabelArr) {
-        this.houseLabelArr = houseLabelArr;
-    }
+    private  String homeImg;
 
     public String getHomeImg() {
         return homeImg;
@@ -184,6 +96,14 @@ public class TpRentalHouse {
         this.homeImg = homeImg;
     }
 
+    public List<String> getHouseLabelArr() {
+        return houseLabelArr;
+    }
+
+    public void setHouseLabelArr(List<String> houseLabelArr) {
+        this.houseLabelArr = houseLabelArr;
+    }
+
     public Integer getId() {
         return id;
     }
@@ -192,6 +112,14 @@ public class TpRentalHouse {
         this.id = id;
     }
 
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
     public String getHouseName() {
         return houseName;
     }
@@ -304,6 +232,14 @@ public class TpRentalHouse {
         this.bed = bed == null ? null : bed.trim();
     }
 
+    public String getMattress() {
+        return mattress;
+    }
+
+    public void setMattress(String mattress) {
+        this.mattress = mattress == null ? null : mattress.trim();
+    }
+
     public String getWardrobe() {
         return wardrobe;
     }
@@ -312,60 +248,76 @@ public class TpRentalHouse {
         this.wardrobe = wardrobe == null ? null : wardrobe.trim();
     }
 
-    public String getDiningTable() {
-        return diningTable;
+    public String getSofa() {
+        return sofa;
     }
 
-    public void setDiningTable(String diningTable) {
-        this.diningTable = diningTable == null ? null : diningTable.trim();
+    public void setSofa(String sofa) {
+        this.sofa = sofa == null ? null : sofa.trim();
     }
 
-    public String getComputerDesk() {
-        return computerDesk;
+    public String getWashingMachine() {
+        return washingMachine;
     }
 
-    public void setComputerDesk(String computerDesk) {
-        this.computerDesk = computerDesk == null ? null : computerDesk.trim();
+    public void setWashingMachine(String washingMachine) {
+        this.washingMachine = washingMachine == null ? null : washingMachine.trim();
     }
 
-    public String getWaterHeater() {
-        return waterHeater;
+    public String getAirConditioning() {
+        return airConditioning;
     }
 
-    public void setWaterHeater(String waterHeater) {
-        this.waterHeater = waterHeater == null ? null : waterHeater.trim();
+    public void setAirConditioning(String airConditioning) {
+        this.airConditioning = airConditioning == null ? null : airConditioning.trim();
     }
 
-    public String getChair() {
-        return chair;
+    public String getFridge() {
+        return fridge;
     }
 
-    public void setChair(String chair) {
-        this.chair = chair == null ? null : chair.trim();
+    public void setFridge(String fridge) {
+        this.fridge = fridge == null ? null : fridge.trim();
     }
 
-    public String getWashingMachine() {
-        return washingMachine;
+    public String getTv() {
+        return tv;
     }
 
-    public void setWashingMachine(String washingMachine) {
-        this.washingMachine = washingMachine == null ? null : washingMachine.trim();
+    public void setTv(String tv) {
+        this.tv = tv == null ? null : tv.trim();
     }
 
-    public String getAirConditioning() {
-        return airConditioning;
+    public String getSmartLock() {
+        return smartLock;
     }
 
-    public void setAirConditioning(String airConditioning) {
-        this.airConditioning = airConditioning == null ? null : airConditioning.trim();
+    public void setSmartLock(String smartLock) {
+        this.smartLock = smartLock == null ? null : smartLock.trim();
     }
 
-    public String getTableLamp() {
-        return tableLamp;
+    public String getWaterHeater() {
+        return waterHeater;
     }
 
-    public void setTableLamp(String tableLamp) {
-        this.tableLamp = tableLamp == null ? null : tableLamp.trim();
+    public void setWaterHeater(String waterHeater) {
+        this.waterHeater = waterHeater == null ? null : waterHeater.trim();
+    }
+
+    public String getDesk() {
+        return desk;
+    }
+
+    public void setDesk(String desk) {
+        this.desk = desk == null ? null : desk.trim();
+    }
+
+    public String getChair() {
+        return chair;
+    }
+
+    public void setChair(String chair) {
+        this.chair = chair == null ? null : chair.trim();
     }
 
     public String getWifi() {
@@ -376,20 +328,28 @@ public class TpRentalHouse {
         this.wifi = wifi == null ? null : wifi.trim();
     }
 
-    public String getMicrowaveOven() {
-        return microwaveOven;
+    public String getKitchen() {
+        return kitchen;
+    }
+
+    public void setKitchen(String kitchen) {
+        this.kitchen = kitchen == null ? null : kitchen.trim();
+    }
+
+    public String getBathroom() {
+        return bathroom;
     }
 
-    public void setMicrowaveOven(String microwaveOven) {
-        this.microwaveOven = microwaveOven == null ? null : microwaveOven.trim();
+    public void setBathroom(String bathroom) {
+        this.bathroom = bathroom == null ? null : bathroom.trim();
     }
 
-    public String getNaturalGas() {
-        return naturalGas;
+    public String getBalcony() {
+        return balcony;
     }
 
-    public void setNaturalGas(String naturalGas) {
-        this.naturalGas = naturalGas == null ? null : naturalGas.trim();
+    public void setBalcony(String balcony) {
+        this.balcony = balcony == null ? null : balcony.trim();
     }
 
     public Date getCreateDate() {

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpShop.java

@@ -105,6 +105,19 @@ public class TpShop {
      */
     private List<TpShopType> tpShopTypeList;
 
+    /**
+     * 商铺首页图
+     */
+    private String tpShopImgUrl;
+
+    public String getTpShopImgUrl() {
+        return tpShopImgUrl;
+    }
+
+    public void setTpShopImgUrl(String tpShopImgUrl) {
+        this.tpShopImgUrl = tpShopImgUrl;
+    }
+
     public List<TpShopType> getTpShopTypeList() {
         return tpShopTypeList;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpHotelServiceimpl.java

@@ -61,13 +61,13 @@ public class TpHotelServiceimpl implements TpHotelServicel {
         ResponseBean response= new ResponseBean<>();
         // 查询当前的酒店是否展示
         TpHotel tpHotel = null;
-        List<String> img = null;
+        String img = null;
         String  hotelSetting= tpHotelMapper.hotelSetting(userElement.getCommunityId());
         if (null != hotelSetting){
              tpHotel= tpHotelMapper.selectCommunityHotel(userElement.getCommunityId());
             List<TpHotelRoom> tpHotelRoom = tpHotelRoomMapper.selectHotelRoomList(userElement.getCommunityId(),tpHotel.getId());
             tpHotel.setTpHotelRoomsList(tpHotelRoom);
-            img = tpHotelImgMapper.selectHotelImg(tpHotel.getId(), userElement.getCommunityId(),2);
+            img = tpHotelImgMapper.selectHotelImg(tpHotel.getId(), userElement.getCommunityId(),1).get(0);
         }
         Map map = new HashMap<>();
         map.put("tpHotel", tpHotel);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServicelImpl.java

@@ -5,7 +5,6 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpRentalHouseImgMapper;
 import com.community.huiju.dao.TpRentalHouseMapper;
-import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpRentalHouse;
 import com.community.huiju.model.TpRentalHouseImg;
 import com.community.huiju.service.TpRentalHouseServicel;
@@ -38,7 +37,7 @@ public class TpRentalHouseServicelImpl implements TpRentalHouseServicel {
         Map<String, Object> parameter = Maps.newHashMap();
         //使用分页插件
         Page<TpRentalHouse> pageTpRentalHouseList = PageHelper.startPage(pageNum, pageSize);
-        List<TpRentalHouse> tpRentalHouseList= tpRentalHouseMapper.getRentalHouse(houseName,rentalType,houseType,rentalPrice,priceFluctuate);
+        List<TpRentalHouse> tpRentalHouseList= tpRentalHouseMapper.getRentalHouse(houseName,rentalType,houseType,rentalPrice,priceFluctuate,userElement.getCommunityId());
             // 把字符串转数组
         for (TpRentalHouse tpRentalHouse:tpRentalHouseList){
             String [] result = tpRentalHouse.getHouseLabel().split(",");

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpShopServicelmpl.java

@@ -89,12 +89,13 @@ public class TpShopServicelmpl implements TpShopServicel {
             for (TpShop tpShop : tpShopList) {
                 // 1 表示查询当前首页图片
                 List<TpShopImg> tpShopImgList = tpShopImgMapper.selectShopIdCommunity(userElement.getCommunityId(), tpShop.getId(), 1);
-                tpShop.setTpShopImgList(tpShopImgList);
+               TpShopImg tpShopImg= tpShopImgList.get(0);
+                tpShop.setTpShopImgUrl(tpShopImg.getImgUrl());
             }
             // 查询当前商铺类型
             tpShopTypeList = tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());
            for (TpShopType tpShopType:tpShopTypeList){
-               int a=tpShopType.getId().intValue();
+               int a=tpShopType.getSort().intValue();
              if (a == 1){
                  //美食图片
                  List<String> tpShopTypeImg = new ArrayList<>();

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.community.huiju.dao.TpRentalHouseMapper" >
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpRentalHouse" >
     <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="house_name" property="houseName" jdbcType="VARCHAR" />
     <result column="rental_price" property="rentalPrice" jdbcType="VARCHAR" />
     <result column="area" property="area" jdbcType="VARCHAR" />
@@ -17,17 +18,21 @@
     <result column="community_longitude" property="communityLongitude" jdbcType="VARCHAR" />
     <result column="community_latitude" property="communityLatitude" jdbcType="VARCHAR" />
     <result column="bed" property="bed" jdbcType="VARCHAR" />
+    <result column="mattress" property="mattress" jdbcType="VARCHAR" />
     <result column="wardrobe" property="wardrobe" jdbcType="VARCHAR" />
-    <result column="dining_table" property="diningTable" jdbcType="VARCHAR" />
-    <result column="computer_desk" property="computerDesk" jdbcType="VARCHAR" />
-    <result column="water_heater" property="waterHeater" jdbcType="VARCHAR" />
-    <result column="chair" property="chair" jdbcType="VARCHAR" />
+    <result column="sofa" property="sofa" jdbcType="VARCHAR" />
     <result column="washing_machine" property="washingMachine" jdbcType="VARCHAR" />
     <result column="air_conditioning" property="airConditioning" jdbcType="VARCHAR" />
-    <result column="table_lamp" property="tableLamp" jdbcType="VARCHAR" />
+    <result column="fridge" property="fridge" jdbcType="VARCHAR" />
+    <result column="TV" property="tv" jdbcType="VARCHAR" />
+    <result column="smart_lock" property="smartLock" jdbcType="VARCHAR" />
+    <result column="water_heater" property="waterHeater" jdbcType="VARCHAR" />
+    <result column="desk" property="desk" jdbcType="VARCHAR" />
+    <result column="chair" property="chair" jdbcType="VARCHAR" />
     <result column="WiFi" property="wifi" jdbcType="VARCHAR" />
-    <result column="microwave_oven" property="microwaveOven" jdbcType="VARCHAR" />
-    <result column="natural_gas" property="naturalGas" jdbcType="VARCHAR" />
+    <result column="kitchen" property="kitchen" jdbcType="VARCHAR" />
+    <result column="bathroom" property="bathroom" jdbcType="VARCHAR" />
+    <result column="balcony" property="balcony" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="create_user" property="createUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
@@ -37,17 +42,17 @@
     <result column="house_introduction" property="houseIntroduction" jdbcType="LONGVARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, house_name, rental_price, area, rental_type, house_type, house_status, house_level, 
-    house_label, sort, house_tel, community_address, community_longitude, community_latitude, 
-    bed, wardrobe, dining_table, computer_desk, water_heater, chair, washing_machine, 
-    air_conditioning, table_lamp, WiFi, microwave_oven, natural_gas, create_date, create_user, 
-    update_date, update_user
+    id, community_id, house_name, rental_price, area, rental_type, house_type, house_status,
+    house_level, house_label, sort, house_tel, community_address, community_longitude,
+    community_latitude, bed, mattress, wardrobe, sofa, washing_machine, air_conditioning,
+    fridge, TV, smart_lock, water_heater, desk, chair, WiFi, kitchen, bathroom, balcony,
+    create_date, create_user, update_date, update_user
   </sql>
   <sql id="Blob_Column_List" >
     house_introduction
   </sql>
   <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -59,28 +64,32 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpRentalHouse" >
-    insert into tp_rental_house (id, house_name, rental_price, 
-      area, rental_type, house_type, 
-      house_status, house_level, house_label, 
-      sort, house_tel, community_address, 
-      community_longitude, community_latitude, 
-      bed, wardrobe, dining_table, 
-      computer_desk, water_heater, chair, 
-      washing_machine, air_conditioning, table_lamp, 
-      WiFi, microwave_oven, natural_gas, 
-      create_date, create_user, update_date, 
-      update_user, house_introduction)
-    values (#{id,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, #{rentalPrice,jdbcType=VARCHAR}, 
-      #{area,jdbcType=VARCHAR}, #{rentalType,jdbcType=VARCHAR}, #{houseType,jdbcType=VARCHAR}, 
-      #{houseStatus,jdbcType=VARCHAR}, #{houseLevel,jdbcType=VARCHAR}, #{houseLabel,jdbcType=VARCHAR}, 
-      #{sort,jdbcType=INTEGER}, #{houseTel,jdbcType=VARCHAR}, #{communityAddress,jdbcType=VARCHAR}, 
-      #{communityLongitude,jdbcType=VARCHAR}, #{communityLatitude,jdbcType=VARCHAR}, 
-      #{bed,jdbcType=VARCHAR}, #{wardrobe,jdbcType=VARCHAR}, #{diningTable,jdbcType=VARCHAR}, 
-      #{computerDesk,jdbcType=VARCHAR}, #{waterHeater,jdbcType=VARCHAR}, #{chair,jdbcType=VARCHAR}, 
-      #{washingMachine,jdbcType=VARCHAR}, #{airConditioning,jdbcType=VARCHAR}, #{tableLamp,jdbcType=VARCHAR}, 
-      #{wifi,jdbcType=VARCHAR}, #{microwaveOven,jdbcType=VARCHAR}, #{naturalGas,jdbcType=VARCHAR}, 
-      #{createDate,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{houseIntroduction,jdbcType=LONGVARCHAR})
+    insert into tp_rental_house (id, community_id, house_name,
+      rental_price, area, rental_type,
+      house_type, house_status, house_level,
+      house_label, sort, house_tel,
+      community_address, community_longitude, community_latitude,
+      bed, mattress, wardrobe,
+      sofa, washing_machine, air_conditioning,
+      fridge, TV, smart_lock,
+      water_heater, desk, chair,
+      WiFi, kitchen, bathroom,
+      balcony, create_date, create_user,
+      update_date, update_user, house_introduction
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR},
+      #{rentalPrice,jdbcType=VARCHAR}, #{area,jdbcType=VARCHAR}, #{rentalType,jdbcType=VARCHAR},
+      #{houseType,jdbcType=VARCHAR}, #{houseStatus,jdbcType=VARCHAR}, #{houseLevel,jdbcType=VARCHAR},
+      #{houseLabel,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{houseTel,jdbcType=VARCHAR},
+      #{communityAddress,jdbcType=VARCHAR}, #{communityLongitude,jdbcType=VARCHAR}, #{communityLatitude,jdbcType=VARCHAR},
+      #{bed,jdbcType=VARCHAR}, #{mattress,jdbcType=VARCHAR}, #{wardrobe,jdbcType=VARCHAR},
+      #{sofa,jdbcType=VARCHAR}, #{washingMachine,jdbcType=VARCHAR}, #{airConditioning,jdbcType=VARCHAR},
+      #{fridge,jdbcType=VARCHAR}, #{tv,jdbcType=VARCHAR}, #{smartLock,jdbcType=VARCHAR},
+      #{waterHeater,jdbcType=VARCHAR}, #{desk,jdbcType=VARCHAR}, #{chair,jdbcType=VARCHAR},
+      #{wifi,jdbcType=VARCHAR}, #{kitchen,jdbcType=VARCHAR}, #{bathroom,jdbcType=VARCHAR},
+      #{balcony,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER},
+      #{updateDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{houseIntroduction,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpRentalHouse" >
     insert into tp_rental_house
@@ -88,6 +97,9 @@
       <if test="id != null" >
         id,
       </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
       <if test="houseName != null" >
         house_name,
       </if>
@@ -130,20 +142,14 @@
       <if test="bed != null" >
         bed,
       </if>
+      <if test="mattress != null" >
+        mattress,
+      </if>
       <if test="wardrobe != null" >
         wardrobe,
       </if>
-      <if test="diningTable != null" >
-        dining_table,
-      </if>
-      <if test="computerDesk != null" >
-        computer_desk,
-      </if>
-      <if test="waterHeater != null" >
-        water_heater,
-      </if>
-      <if test="chair != null" >
-        chair,
+      <if test="sofa != null" >
+        sofa,
       </if>
       <if test="washingMachine != null" >
         washing_machine,
@@ -151,17 +157,35 @@
       <if test="airConditioning != null" >
         air_conditioning,
       </if>
-      <if test="tableLamp != null" >
-        table_lamp,
+      <if test="fridge != null" >
+        fridge,
+      </if>
+      <if test="tv != null" >
+        TV,
+      </if>
+      <if test="smartLock != null" >
+        smart_lock,
+      </if>
+      <if test="waterHeater != null" >
+        water_heater,
+      </if>
+      <if test="desk != null" >
+        desk,
+      </if>
+      <if test="chair != null" >
+        chair,
       </if>
       <if test="wifi != null" >
         WiFi,
       </if>
-      <if test="microwaveOven != null" >
-        microwave_oven,
+      <if test="kitchen != null" >
+        kitchen,
       </if>
-      <if test="naturalGas != null" >
-        natural_gas,
+      <if test="bathroom != null" >
+        bathroom,
+      </if>
+      <if test="balcony != null" >
+        balcony,
       </if>
       <if test="createDate != null" >
         create_date,
@@ -183,6 +207,9 @@
       <if test="id != null" >
         #{id,jdbcType=INTEGER},
       </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
       <if test="houseName != null" >
         #{houseName,jdbcType=VARCHAR},
       </if>
@@ -225,20 +252,14 @@
       <if test="bed != null" >
         #{bed,jdbcType=VARCHAR},
       </if>
+      <if test="mattress != null" >
+        #{mattress,jdbcType=VARCHAR},
+      </if>
       <if test="wardrobe != null" >
         #{wardrobe,jdbcType=VARCHAR},
       </if>
-      <if test="diningTable != null" >
-        #{diningTable,jdbcType=VARCHAR},
-      </if>
-      <if test="computerDesk != null" >
-        #{computerDesk,jdbcType=VARCHAR},
-      </if>
-      <if test="waterHeater != null" >
-        #{waterHeater,jdbcType=VARCHAR},
-      </if>
-      <if test="chair != null" >
-        #{chair,jdbcType=VARCHAR},
+      <if test="sofa != null" >
+        #{sofa,jdbcType=VARCHAR},
       </if>
       <if test="washingMachine != null" >
         #{washingMachine,jdbcType=VARCHAR},
@@ -246,17 +267,35 @@
       <if test="airConditioning != null" >
         #{airConditioning,jdbcType=VARCHAR},
       </if>
-      <if test="tableLamp != null" >
-        #{tableLamp,jdbcType=VARCHAR},
+      <if test="fridge != null" >
+        #{fridge,jdbcType=VARCHAR},
+      </if>
+      <if test="tv != null" >
+        #{tv,jdbcType=VARCHAR},
+      </if>
+      <if test="smartLock != null" >
+        #{smartLock,jdbcType=VARCHAR},
+      </if>
+      <if test="waterHeater != null" >
+        #{waterHeater,jdbcType=VARCHAR},
+      </if>
+      <if test="desk != null" >
+        #{desk,jdbcType=VARCHAR},
+      </if>
+      <if test="chair != null" >
+        #{chair,jdbcType=VARCHAR},
       </if>
       <if test="wifi != null" >
         #{wifi,jdbcType=VARCHAR},
       </if>
-      <if test="microwaveOven != null" >
-        #{microwaveOven,jdbcType=VARCHAR},
+      <if test="kitchen != null" >
+        #{kitchen,jdbcType=VARCHAR},
+      </if>
+      <if test="bathroom != null" >
+        #{bathroom,jdbcType=VARCHAR},
       </if>
-      <if test="naturalGas != null" >
-        #{naturalGas,jdbcType=VARCHAR},
+      <if test="balcony != null" >
+        #{balcony,jdbcType=VARCHAR},
       </if>
       <if test="createDate != null" >
         #{createDate,jdbcType=TIMESTAMP},
@@ -278,6 +317,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpRentalHouse" >
     update tp_rental_house
     <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
       <if test="houseName != null" >
         house_name = #{houseName,jdbcType=VARCHAR},
       </if>
@@ -320,20 +362,14 @@
       <if test="bed != null" >
         bed = #{bed,jdbcType=VARCHAR},
       </if>
+      <if test="mattress != null" >
+        mattress = #{mattress,jdbcType=VARCHAR},
+      </if>
       <if test="wardrobe != null" >
         wardrobe = #{wardrobe,jdbcType=VARCHAR},
       </if>
-      <if test="diningTable != null" >
-        dining_table = #{diningTable,jdbcType=VARCHAR},
-      </if>
-      <if test="computerDesk != null" >
-        computer_desk = #{computerDesk,jdbcType=VARCHAR},
-      </if>
-      <if test="waterHeater != null" >
-        water_heater = #{waterHeater,jdbcType=VARCHAR},
-      </if>
-      <if test="chair != null" >
-        chair = #{chair,jdbcType=VARCHAR},
+      <if test="sofa != null" >
+        sofa = #{sofa,jdbcType=VARCHAR},
       </if>
       <if test="washingMachine != null" >
         washing_machine = #{washingMachine,jdbcType=VARCHAR},
@@ -341,17 +377,35 @@
       <if test="airConditioning != null" >
         air_conditioning = #{airConditioning,jdbcType=VARCHAR},
       </if>
-      <if test="tableLamp != null" >
-        table_lamp = #{tableLamp,jdbcType=VARCHAR},
+      <if test="fridge != null" >
+        fridge = #{fridge,jdbcType=VARCHAR},
+      </if>
+      <if test="tv != null" >
+        TV = #{tv,jdbcType=VARCHAR},
+      </if>
+      <if test="smartLock != null" >
+        smart_lock = #{smartLock,jdbcType=VARCHAR},
+      </if>
+      <if test="waterHeater != null" >
+        water_heater = #{waterHeater,jdbcType=VARCHAR},
+      </if>
+      <if test="desk != null" >
+        desk = #{desk,jdbcType=VARCHAR},
+      </if>
+      <if test="chair != null" >
+        chair = #{chair,jdbcType=VARCHAR},
       </if>
       <if test="wifi != null" >
         WiFi = #{wifi,jdbcType=VARCHAR},
       </if>
-      <if test="microwaveOven != null" >
-        microwave_oven = #{microwaveOven,jdbcType=VARCHAR},
+      <if test="kitchen != null" >
+        kitchen = #{kitchen,jdbcType=VARCHAR},
       </if>
-      <if test="naturalGas != null" >
-        natural_gas = #{naturalGas,jdbcType=VARCHAR},
+      <if test="bathroom != null" >
+        bathroom = #{bathroom,jdbcType=VARCHAR},
+      </if>
+      <if test="balcony != null" >
+        balcony = #{balcony,jdbcType=VARCHAR},
       </if>
       <if test="createDate != null" >
         create_date = #{createDate,jdbcType=TIMESTAMP},
@@ -373,7 +427,8 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.community.huiju.model.TpRentalHouse" >
     update tp_rental_house
-    set house_name = #{houseName,jdbcType=VARCHAR},
+    set community_id = #{communityId,jdbcType=INTEGER},
+      house_name = #{houseName,jdbcType=VARCHAR},
       rental_price = #{rentalPrice,jdbcType=VARCHAR},
       area = #{area,jdbcType=VARCHAR},
       rental_type = #{rentalType,jdbcType=VARCHAR},
@@ -387,17 +442,21 @@
       community_longitude = #{communityLongitude,jdbcType=VARCHAR},
       community_latitude = #{communityLatitude,jdbcType=VARCHAR},
       bed = #{bed,jdbcType=VARCHAR},
+      mattress = #{mattress,jdbcType=VARCHAR},
       wardrobe = #{wardrobe,jdbcType=VARCHAR},
-      dining_table = #{diningTable,jdbcType=VARCHAR},
-      computer_desk = #{computerDesk,jdbcType=VARCHAR},
-      water_heater = #{waterHeater,jdbcType=VARCHAR},
-      chair = #{chair,jdbcType=VARCHAR},
+      sofa = #{sofa,jdbcType=VARCHAR},
       washing_machine = #{washingMachine,jdbcType=VARCHAR},
       air_conditioning = #{airConditioning,jdbcType=VARCHAR},
-      table_lamp = #{tableLamp,jdbcType=VARCHAR},
+      fridge = #{fridge,jdbcType=VARCHAR},
+      TV = #{tv,jdbcType=VARCHAR},
+      smart_lock = #{smartLock,jdbcType=VARCHAR},
+      water_heater = #{waterHeater,jdbcType=VARCHAR},
+      desk = #{desk,jdbcType=VARCHAR},
+      chair = #{chair,jdbcType=VARCHAR},
       WiFi = #{wifi,jdbcType=VARCHAR},
-      microwave_oven = #{microwaveOven,jdbcType=VARCHAR},
-      natural_gas = #{naturalGas,jdbcType=VARCHAR},
+      kitchen = #{kitchen,jdbcType=VARCHAR},
+      bathroom = #{bathroom,jdbcType=VARCHAR},
+      balcony = #{balcony,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       create_user = #{createUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
@@ -407,7 +466,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpRentalHouse" >
     update tp_rental_house
-    set house_name = #{houseName,jdbcType=VARCHAR},
+    set community_id = #{communityId,jdbcType=INTEGER},
+      house_name = #{houseName,jdbcType=VARCHAR},
       rental_price = #{rentalPrice,jdbcType=VARCHAR},
       area = #{area,jdbcType=VARCHAR},
       rental_type = #{rentalType,jdbcType=VARCHAR},
@@ -421,17 +481,21 @@
       community_longitude = #{communityLongitude,jdbcType=VARCHAR},
       community_latitude = #{communityLatitude,jdbcType=VARCHAR},
       bed = #{bed,jdbcType=VARCHAR},
+      mattress = #{mattress,jdbcType=VARCHAR},
       wardrobe = #{wardrobe,jdbcType=VARCHAR},
-      dining_table = #{diningTable,jdbcType=VARCHAR},
-      computer_desk = #{computerDesk,jdbcType=VARCHAR},
-      water_heater = #{waterHeater,jdbcType=VARCHAR},
-      chair = #{chair,jdbcType=VARCHAR},
+      sofa = #{sofa,jdbcType=VARCHAR},
       washing_machine = #{washingMachine,jdbcType=VARCHAR},
       air_conditioning = #{airConditioning,jdbcType=VARCHAR},
-      table_lamp = #{tableLamp,jdbcType=VARCHAR},
+      fridge = #{fridge,jdbcType=VARCHAR},
+      TV = #{tv,jdbcType=VARCHAR},
+      smart_lock = #{smartLock,jdbcType=VARCHAR},
+      water_heater = #{waterHeater,jdbcType=VARCHAR},
+      desk = #{desk,jdbcType=VARCHAR},
+      chair = #{chair,jdbcType=VARCHAR},
       WiFi = #{wifi,jdbcType=VARCHAR},
-      microwave_oven = #{microwaveOven,jdbcType=VARCHAR},
-      natural_gas = #{naturalGas,jdbcType=VARCHAR},
+      kitchen = #{kitchen,jdbcType=VARCHAR},
+      bathroom = #{bathroom,jdbcType=VARCHAR},
+      balcony = #{balcony,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       create_user = #{createUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
@@ -450,10 +514,10 @@
         AND rh.community_address like concat('%',#{houseName},'%')
       </if>
       <if test="rentalType == 1" >
-          and rh.rental_type = '1'
+        and rh.rental_type = '1'
       </if>
       <if test="rentalType == 2" >
-           and rh.rental_type = '2'
+        and rh.rental_type = '2'
       </if>
 
       <if test="houseType == 1" >
@@ -507,9 +571,8 @@
       <if test="priceFluctuate == 2" >
         and  order by rh.rental_price  desc
       </if>
-        and rh.house_status = 1
+      and community_id = #{communityId}
+      and rh.house_status = 1
     </where>
   </select>
-
-
 </mapper>

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

@@ -117,7 +117,7 @@
   <select id="selectCommunityIdShop" resultMap="BaseResultMap">
     select
     *
-    from  tp_shop_type where community_id = #{communityId,jdbcType=INTEGER}
+    from  tp_shop_type where community_id = #{communityId,jdbcType=INTEGER} and source = 'sys'
   </select>
 
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java

@@ -1,10 +1,32 @@
 package com.community.huiju.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TpRentalHouse;
+import com.community.huiju.model.TpShop;
+import com.community.huiju.service.ITpRentalHouseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpSession;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 出租公寓表 前端控制器
@@ -15,6 +37,140 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/")
+@RefreshScope
+@Api(value = "长租公寓API", description = "长租公寓API")
 public class TpRentalHouseController extends BaseController {
-
+	
+	@Autowired
+	private ITpRentalHouseService tpRentalHouseService;
+	
+	@ApiOperation(value = "根据搜索条件获取公寓列表", notes = "根据搜索条件获取公寓列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "房间编号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseName", value = "房间名称"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "startPrice", value = "开始价格"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "endPrice", value = "结束价格"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "rentalType", value = "租赁方式"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseType", value = "户型"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseStatus", value = "上架状态"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+	})
+	@RequestMapping(value = "/rentals",method = RequestMethod.GET)
+	public ResponseBean getRentalList(@RequestParam(value = "id") Integer id,
+	                                @RequestParam(value = "houseName") String houseName,
+	                                @RequestParam(value = "startPrice") String startPrice,
+	                                @RequestParam(value = "endPrice") String endPrice,
+	                                @RequestParam(value = "rentalType") String rentalType,
+	                                @RequestParam(value = "houseType") String houseType,
+	                                @RequestParam(value = "houseStatus") String houseStatus,
+	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+	                                HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = tpRentalHouseService.getRentalList(id,houseName,startPrice,endPrice,rentalType,houseType,houseStatus,userElement,pageNum,pageSize);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "添加公寓", notes = "添加公寓")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpRentalHouse", name = "rentalHouse", value = "公寓"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/add",method = RequestMethod.POST)
+	public ResponseBean saveRental(@RequestBody TpRentalHouse rentalHouse, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = tpRentalHouseService.saveRental(rentalHouse,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "更新公寓", notes = "更新公寓")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpRentalHouse", name = "rentalHouse", value = "公寓"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/update",method = RequestMethod.POST)
+	public ResponseBean updateRental(@RequestBody TpRentalHouse rentalHouse, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = tpRentalHouseService.updateRental(rentalHouse,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取公寓信息", notes = "获取公寓信息")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "公寓Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/get/{id}",method = RequestMethod.GET)
+	public ResponseBean getRental(@PathVariable Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpRentalHouse rentalHouse = tpRentalHouseService.getRentalById(id);
+		responseBean.addSuccess(rentalHouse);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "上架房间", notes = "上架房间")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "房间id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/shelf",method = RequestMethod.POST)
+	public ResponseBean shelfRental(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpRentalHouse> rentalList = new ArrayList<>();
+		for (Object id : ids){
+			TpRentalHouse rentalHouse = new TpRentalHouse();
+			rentalHouse.setId((Integer) id);
+			rentalHouse.setHouseStatus("1");
+			rentalHouse.setUpdateUser(userElement.getId());
+			rentalHouse.setUpdateDate(LocalDateTime.now());
+			rentalList.add(rentalHouse);
+		}
+		
+		boolean state = tpRentalHouseService.updateBatchById(rentalList);
+		if (state){
+			responseBean.addSuccess("上架成功");
+		}else{
+			responseBean.addError("上架失败");
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "下架房间", notes = "下架房间")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "房间id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/obtained",method = RequestMethod.POST)
+	public ResponseBean obtainedRental(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpRentalHouse> rentalList = new ArrayList<>();
+		for (Object id : ids){
+			TpRentalHouse rentalHouse = new TpRentalHouse();
+			rentalHouse.setId((Integer) id);
+			rentalHouse.setHouseStatus("2");
+			rentalHouse.setUpdateUser(userElement.getId());
+			rentalHouse.setUpdateDate(LocalDateTime.now());
+			rentalList.add(rentalHouse);
+		}
+		
+		boolean state = tpRentalHouseService.updateBatchById(rentalList);
+		if (state){
+			responseBean.addSuccess("下架成功");
+		}else{
+			responseBean.addError("下架失败");
+		}
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpShopController.java

@@ -10,10 +10,12 @@ import com.community.huiju.model.TpShop;
 import com.community.huiju.model.TpShopType;
 import com.community.huiju.service.ITpShopService;
 import com.netflix.ribbon.proxy.annotation.Http;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,6 +38,8 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/")
+@RefreshScope
+@Api(value = "商铺API", description = "商铺API")
 public class TpShopController extends BaseController {
 	
 	@Autowired

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRentalHouseImgMapper.java

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.TpRentalHouseImg;
 
+import java.util.List;
+
 /**
  * <p>
  * 出租房间图片 Mapper 接口
@@ -12,5 +14,6 @@ import com.community.huiju.model.TpRentalHouseImg;
  * @since 2019-05-13
  */
 public interface TpRentalHouseImgMapper extends BaseMapper<TpRentalHouseImg> {
-
+	
+	int batchInsert(List<TpRentalHouseImg> rentalHouseImgList);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRentalHouseMapper.java

@@ -1,7 +1,11 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.huiju.model.TpRentalHouse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,12 @@ import com.community.huiju.model.TpRentalHouse;
  * @since 2019-05-13
  */
 public interface TpRentalHouseMapper extends BaseMapper<TpRentalHouse> {
-
+	
+	/**
+	 * 获取公寓列表
+	 * @param page
+	 * @param tpRentalHouse
+	 * @return
+	 */
+	List<TpRentalHouse> getRentalList(Page page, @Param("tpRentalHouse") TpRentalHouse tpRentalHouse);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpRentalHouse.java

@@ -1,12 +1,15 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -14,7 +17,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author jobob
- * @since 2019-05-13
+ * @since 2019-05-14
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -22,6 +25,14 @@ import java.time.LocalDateTime;
 public class TpRentalHouse implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    
+    /**
+     * 我们系统的小区ID
+     */
+    private Integer communityId;
 
     /**
      * 房间名称
@@ -98,45 +109,61 @@ public class TpRentalHouse implements Serializable {
      */
     private String bed;
 
+    /**
+     * 床垫 1 有
+     */
+    private String mattress;
+
     /**
      * 衣柜 1 有
      */
     private String wardrobe;
 
     /**
-     * 餐桌 1 有
+     * 沙发 1 有
      */
-    private String diningTable;
+    private String sofa;
 
     /**
-     * 电脑桌 1 有
+     *  洗衣机 1 有
      */
-    private String computerDesk;
+    private String washingMachine;
 
     /**
-     * 热水器 1 有
+     * 空调 1 有
      */
-    private String waterHeater;
+    private String airConditioning;
 
     /**
-     * 椅子 1 有
+     * 冰箱 1 有
      */
-    private String chair;
+    private String fridge;
 
     /**
-     *  洗衣机 1 有
+     * 电视 1有
      */
-    private String washingMachine;
+    @TableField("TV")
+    private String tv;
 
     /**
-     * 空调 1 有
+     * 智能锁 1有
      */
-    private String airConditioning;
+    private String smartLock;
+
+    /**
+     * 热水器 1 有
+     */
+    private String waterHeater;
 
     /**
-     * 台灯 1 有
+     * 桌子 1 有
      */
-    private String tableLamp;
+    private String desk;
+
+    /**
+     * 椅子 1 有
+     */
+    private String chair;
 
     /**
      * WiFi 1 有
@@ -145,14 +172,19 @@ public class TpRentalHouse implements Serializable {
     private String WiFi;
 
     /**
-     * 微波炉 1 有
+     * 厨房 1 有
      */
-    private String microwaveOven;
+    private String kitchen;
 
     /**
-     * 天然气 1 有
+     * 独卫 1 有
      */
-    private String naturalGas;
+    private String bathroom;
+
+    /**
+     * 阳台 1 有
+     */
+    private String balcony;
 
     /**
      * 创建时间
@@ -173,6 +205,34 @@ public class TpRentalHouse implements Serializable {
      * 更新人
      */
     private Integer updateUser;
-
-
+    
+    /**
+     * 开始价格
+     */
+    @TableField(exist = false)
+    private String startPrice;
+    
+    /**
+     * 结束价格
+     */
+    @TableField(exist = false)
+    private String endPrice;
+    
+    /**
+     * 更新人
+     */
+    @TableField(exist = false)
+    private String userName;
+    
+    /**
+     * 列表图片
+     */
+    @TableField(exist = false)
+    private String appListImg;
+    
+    /**
+     * 轮播图
+     */
+    @TableField(exist = false)
+    private List<String> appCarouselImg;
 }

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

@@ -1,6 +1,8 @@
 package com.community.huiju.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TpRentalHouse;
 
 /**
@@ -12,5 +14,43 @@ import com.community.huiju.model.TpRentalHouse;
  * @since 2019-05-13
  */
 public interface ITpRentalHouseService extends IService<TpRentalHouse> {
-
+	
+	/**
+	 * 获取公寓房间列表
+	 * @param id
+	 * @param houseName
+	 * @param startPrice
+	 * @param endPrice
+	 * @param rentalType
+	 * @param houseType
+	 * @param houseStatus
+	 * @param userElement
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	ResponseBean getRentalList(Integer id, String houseName, String startPrice, String endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 保存长租公寓房间信息
+	 * @param rentalHouse
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean saveRental(TpRentalHouse rentalHouse, UserElement userElement);
+	
+	/**
+	 * 根据ID取值
+	 * @param id
+	 * @return
+	 */
+	TpRentalHouse getRentalById(Integer id);
+	
+	/**
+	 * 更新公寓
+	 * @param rentalHouse
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean updateRental(TpRentalHouse rentalHouse, UserElement userElement);
 }

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

@@ -1,11 +1,24 @@
 package com.community.huiju.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TpRentalHouseImgMapper;
 import com.community.huiju.dao.TpRentalHouseMapper;
 import com.community.huiju.model.TpRentalHouse;
+import com.community.huiju.model.TpRentalHouseImg;
 import com.community.huiju.service.ITpRentalHouseService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 出租公寓表 服务实现类
@@ -16,5 +29,164 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, TpRentalHouse> implements ITpRentalHouseService {
-
+	
+	@Autowired
+	private TpRentalHouseMapper tpRentalHouseMapper;
+	
+	@Autowired
+	private TpRentalHouseImgMapper tpRentalHouseImgMapper;
+	
+	/**
+	 * 获取公寓房间列表
+	 *
+	 * @param id
+	 * @param houseName
+	 * @param startPrice
+	 * @param endPrice
+	 * @param rentalType
+	 * @param houseType
+	 * @param houseStatus
+	 * @param userElement
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	@Override
+	public ResponseBean getRentalList(Integer id, String houseName, String startPrice, String endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize) {
+		ResponseBean responseBean = new ResponseBean();
+		Page page = new Page(pageNum,pageSize);
+		TpRentalHouse tpRentalHouse = new TpRentalHouse();
+		tpRentalHouse.setId(id);
+		tpRentalHouse.setHouseName(houseName);
+		tpRentalHouse.setRentalType(rentalType);
+		tpRentalHouse.setHouseType(houseType);
+		tpRentalHouse.setHouseStatus(houseStatus);
+		tpRentalHouse.setCommunityId(userElement.getCommunityId());
+		tpRentalHouse.setStartPrice(startPrice);
+		tpRentalHouse.setEndPrice(endPrice);
+		List<TpRentalHouse> list = tpRentalHouseMapper.getRentalList(page,tpRentalHouse);
+		Map<String,Object> map = new HashMap<>();
+		map.put("list", list);
+		map.put("total", page.getTotal());
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+	
+	/**
+	 * 保存长租公寓房间信息
+	 *
+	 * @param rentalHouse
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean saveRental(TpRentalHouse rentalHouse, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		//插入房间信息
+		Integer communityId = userElement.getCommunityId();
+		Integer userId = userElement.getId();
+		LocalDateTime nowTime = LocalDateTime.now();
+		rentalHouse.setCommunityId(communityId);
+		rentalHouse.setCreateDate(nowTime);
+		rentalHouse.setCreateUser(userId);
+		tpRentalHouseMapper.insert(rentalHouse);
+		//插入公寓首页图信息
+		TpRentalHouseImg tpRentalHouseImg = new TpRentalHouseImg();
+		tpRentalHouseImg.setCommunityId(communityId);
+		tpRentalHouseImg.setCreateDate(nowTime);
+		tpRentalHouseImg.setRentalHouseId(rentalHouse.getId());
+		tpRentalHouseImg.setImgType("1");
+		tpRentalHouseImg.setImgUrl(rentalHouse.getAppListImg());
+		tpRentalHouseImgMapper.insert(tpRentalHouseImg);
+		//插入公寓轮播图信息
+		List<String> imgList = rentalHouse.getAppCarouselImg();
+		List<TpRentalHouseImg> rentalHouseImgList = new ArrayList<>();
+		imgList.stream().forEach(e -> {
+			TpRentalHouseImg rentalHouseImg = new TpRentalHouseImg();
+			rentalHouseImg.setCommunityId(communityId);
+			rentalHouseImg.setCreateDate(nowTime);
+			rentalHouseImg.setRentalHouseId(rentalHouse.getId());
+			rentalHouseImg.setImgType("2");
+			rentalHouseImg.setImgUrl(e);
+			rentalHouseImgList.add(rentalHouseImg);
+		});
+		tpRentalHouseImgMapper.batchInsert(rentalHouseImgList);
+		responseBean.addSuccess("插入成功");
+		return responseBean;
+	}
+	
+	/**
+	 * 根据ID取值
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public TpRentalHouse getRentalById(Integer id) {
+		//获取公寓数据
+		TpRentalHouse tpRentalHouse = tpRentalHouseMapper.selectById(id);
+		//获取公寓列表图片
+		QueryWrapper<TpRentalHouseImg> tpRentalHouseImgQueryWrapper = new QueryWrapper<>();
+		tpRentalHouseImgQueryWrapper.eq("community_id", tpRentalHouse.getCommunityId());
+		tpRentalHouseImgQueryWrapper.eq("rental_house_id",tpRentalHouse.getId());
+		tpRentalHouseImgQueryWrapper.eq("img_type","1");
+		TpRentalHouseImg tpRentalHouseImg = tpRentalHouseImgMapper.selectOne(tpRentalHouseImgQueryWrapper);
+		tpRentalHouse.setAppListImg(tpRentalHouseImg.getImgUrl());
+		//获取公寓轮播图图片
+		QueryWrapper<TpRentalHouseImg> carouseQueryWrapper = new QueryWrapper<>();
+		carouseQueryWrapper.eq("community_id", tpRentalHouse.getCommunityId());
+		carouseQueryWrapper.eq("rental_house_id",tpRentalHouse.getId());
+		carouseQueryWrapper.eq("img_type","2");
+		List<TpRentalHouseImg> tpRentalHouseImgList = tpRentalHouseImgMapper.selectList(carouseQueryWrapper);
+		List<String> imgList = new ArrayList<>();
+		tpRentalHouseImgList.stream().forEach(e -> {
+			imgList.add(e.getImgUrl());
+		});
+		tpRentalHouse.setAppCarouselImg(imgList);
+		return tpRentalHouse;
+	}
+	
+	/**
+	 * 更新公寓
+	 *
+	 * @param rentalHouse
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean updateRental(TpRentalHouse rentalHouse, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		rentalHouse.setUpdateDate(LocalDateTime.now());
+		rentalHouse.setUpdateUser(userElement.getId());
+		tpRentalHouseMapper.updateById(rentalHouse);
+		//更新首页图片
+		QueryWrapper<TpRentalHouseImg> tpRentalHouseImgQueryWrapper = new QueryWrapper<>();
+		tpRentalHouseImgQueryWrapper.eq("community_id", rentalHouse.getCommunityId());
+		tpRentalHouseImgQueryWrapper.eq("rental_house_id",rentalHouse.getId());
+		tpRentalHouseImgQueryWrapper.eq("img_type","1");
+		TpRentalHouseImg tpRentalHouseImg = new TpRentalHouseImg();
+		tpRentalHouseImg.setImgUrl(rentalHouse.getAppListImg());
+		tpRentalHouseImgMapper.update(tpRentalHouseImg,tpRentalHouseImgQueryWrapper);
+		//更新轮播图，先删除在添加
+		QueryWrapper<TpRentalHouseImg> deleteQueryWrapper = new QueryWrapper<>();
+		deleteQueryWrapper.eq("community_id", rentalHouse.getCommunityId());
+		deleteQueryWrapper.eq("rental_house_id",rentalHouse.getId());
+		deleteQueryWrapper.eq("img_type","2");
+		tpRentalHouseImgMapper.delete(deleteQueryWrapper);
+		//插入公寓轮播图信息
+		List<String> imgList = rentalHouse.getAppCarouselImg();
+		List<TpRentalHouseImg> rentalHouseImgList = new ArrayList<>();
+		imgList.stream().forEach(e -> {
+			TpRentalHouseImg rentalHouseImg = new TpRentalHouseImg();
+			rentalHouseImg.setCommunityId(rentalHouse.getCommunityId());
+			rentalHouseImg.setCreateDate(LocalDateTime.now());
+			rentalHouseImg.setRentalHouseId(rentalHouse.getId());
+			rentalHouseImg.setImgType("2");
+			rentalHouseImg.setImgUrl(e);
+			rentalHouseImgList.add(rentalHouseImg);
+		});
+		tpRentalHouseImgMapper.batchInsert(rentalHouseImgList);
+		responseBean.addSuccess("更新成功");
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/resources/mapper/HotelRoomMapper.xml

@@ -22,8 +22,8 @@
                 AND date_format(create_date, '%Y-%m-%d') <![CDATA[>= ]]> date_format(#{beginTime}, '%Y-%m-%d')
                 AND date_format(create_date, '%Y-%m-%d')<![CDATA[<= ]]> date_format(#{endTime}, '%Y-%m-%d')
             </if>
-            order by sort desc
         </where>
+        order by sort desc
     </select>
 
 </mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TpRentalHouseImgMapper.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.community.huiju.dao.TpRentalHouseImgMapper">
-
+    <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_rental_house_img(community_id,rental_house_id,img_url,img_type,create_date)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.rentalHouseId},#{item.imgUrl},#{item.imgType},#{item.createDate})
+        </foreach>
+    </insert>
 </mapper>

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

@@ -2,4 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.community.huiju.dao.TpRentalHouseMapper">
 
+    <select id="getRentalList" resultType="com.community.huiju.model.TpRentalHouse">
+        SELECT
+            t.id,
+            t.house_name,
+            t.rental_price,
+            t.rental_type,
+            t.house_type,
+            t.house_status,
+            t.sort,
+            t.update_date,
+            u.user_name
+        FROM
+            tp_rental_house t
+        LEFT JOIN tp_user u ON t.update_user = u.id
+        where 1=1
+        and t.community_id = #{tpRentalHouse.communityId}
+        <if test="tpRentalHouse.id != null and tpRentalHouse.id != ''">
+            and t.id like concat('%',#{tpRentalHouse.id},'%')
+        </if>
+        <if test="tpRentalHouse.houseName != null and tpRentalHouse.houseName != ''">
+            and t.house_name like concat('%',#{tpRentalHouse.houseName},'%')
+        </if>
+        <if test="tpRentalHouse.rentalType != null and tpRentalHouse.rentalType != ''">
+            and t.rental_type  = #{tpRentalHouse.rentalType}
+        </if>
+        <if test="tpRentalHouse.houseType != null and tpRentalHouse.houseType != ''">
+            and t.house_type  = #{tpRentalHouse.houseType}
+        </if>
+        <if test="tpRentalHouse.houseStatus != null and tpRentalHouse.houseStatus != ''">
+            and t.house_status  = #{tpRentalHouse.houseStatus}
+        </if>
+        <if test="tpRentalHouse.startPrice != null and tpRentalHouse.startPrice != ''">
+            and t.rental_price  >= #{tpRentalHouse.startPrice}
+        </if>
+        <if test="tpRentalHouse.endPrice != null and tpRentalHouse.endPrice != ''">
+            and t.rental_price  &lt;= #{tpRentalHouse.endPrice}
+        </if>
+    </select>
 </mapper>

VUECODE/smart-property-manage/src/api/rental.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+export function fetchRentalList(query) {
+  return request({
+    url: '/rentals',
+    method: 'get',
+    params: query
+  })
+}
+
+export function obtainedRental(ids) {
+  return request({
+    url: '/rental/obtained',
+    method: 'post',
+    data: {
+      idArray: ids
+    }
+  })
+}
+
+export function shelfRental(ids) {
+  return request({
+    url: '/rental/shelf',
+    method: 'post',
+    data: {
+      idArray: ids
+    }
+  })
+}
+
+export function addRental(listQuery) {
+  return request({
+    url: '/rental/add',
+    method: 'post',
+    data: listQuery
+  })
+}
+
+export function updateRental(listQuery) {
+  return request({
+    url: '/rental/update',
+    method: 'post',
+    data: listQuery
+  })
+}
+
+export function getRental(id) {
+  return request({
+    url: '/rental/get/' + id,
+    method: 'get'
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -434,7 +434,7 @@ export const constantRouterMap = [
       {
         path: '/rental/add',
         component: () => import('@/views/rental/rentalAdd'),
-        name: 'shop-add',
+        name: 'rental-add',
         hidden: true,
         meta: { title: '添加房间信息', icon: 'table' }
       },

VUECODE/smart-property-manage/src/store/index.js

@@ -24,6 +24,8 @@ import equipment from './modules/equipment'
 import shopType from './modules/shopType'
 import grogshop from './modules/grogshop'
 import license from './modules/license'
+import rental from './modules/rental'
+
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -50,7 +52,8 @@ const store = new Vuex.Store({
     equipment,
     shopType,
     grogshop,
-    license
+    license,
+    rental
   },
   getters
 })

VUECODE/smart-property-manage/src/store/modules/rental.js

@@ -0,0 +1,70 @@
+import { fetchRentalList, shelfRental, obtainedRental, addRental, getRental, updateRental } from '@/api/rental'
+
+const transaction = {
+  namespaced: true,
+  state: {
+  },
+
+  mutations: {
+  },
+
+  actions: {
+    // 获取收费组列表
+    FetchRentalList({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        fetchRentalList(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    AddRental({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        addRental(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    UpdateRental({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        updateRental(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetRental({ commit }, id) {
+      return new Promise((resolve, reject) => {
+        getRental(id).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    ShelfRental({ commit }, ids) {
+      return new Promise((resolve, reject) => {
+        shelfRental(ids).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    ObtainedRental({ commit }, ids) {
+      return new Promise((resolve, reject) => {
+        obtainedRental(ids).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default transaction

VUECODE/smart-property-manage/src/views/rental/rentalAdd.vue

@@ -1,23 +1,14 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
-      <el-form-item label="商铺名称" prop="shopName">
-        <el-input v-model="listData.shopName"/>
+      <el-form-item label="房间名称" prop="houseName">
+        <el-input v-model="listData.houseName"/>
       </el-form-item>
-      <el-form-item label="商铺说明" prop="remark">
-        <el-input v-model="listData.remark"/>
+      <el-form-item label="房间租金" prop="rentalPrice">
+        <el-input v-model="listData.rentalPrice"/>
       </el-form-item>
-      <el-form-item label="app首页展示图" prop="appIndexImg">
-        <el-upload
-          class="avatar-uploader"
-          name="uploadFiles"
-          :action="uploadImgUrl"
-          :show-file-list="false"
-          :on-success="handleAppIndexSuccess"
-          :before-upload="beforeAvatarUpload">
-          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
-          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-        </el-upload>
+      <el-form-item label="面积" prop="area">
+        <el-input v-model="listData.area"/>
       </el-form-item>
       <el-form-item label="app列表展示图" prop="appListImg">
         <el-upload
@@ -31,7 +22,21 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+      <el-form-item label="户型" prop="houseType">
+        <el-select v-model="listData.houseType" placeholder="请选择">
+            <el-option label="一室居" value="1"/>
+            <el-option label="二室居" value="2"/>
+            <el-option label="三室居" value="3"/>
+            <el-option label="四室居及以上" value="4"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="租赁方式" prop="rentalType">
+        <el-select v-model="listData.rentalType" placeholder="请选择">
+            <el-option label="整租" value="1"/>
+            <el-option label="合租" value="2"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="轮播图" prop="appCarouselImg">
         <el-upload
           name="uploadFiles"
           :limit="6"
@@ -46,32 +51,48 @@
           <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="权重" prop="sort">
-        <el-input v-model="listData.sort"/>
-      </el-form-item>
-      <el-form-item label="商铺类型" prop="shopTypeId">
-        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
-          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="上架状态" prop="shopStatus">
-        <el-select v-model="listData.shopStatus" placeholder="请选择">
+      <el-form-item label="上架状态" prop="houseStatus">
+        <el-select v-model="listData.houseStatus" placeholder="请选择">
           <el-option label="已上架" value="1"/>
           <el-option label="已下架" value="2"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="联系电话" prop="shopTel">
-        <el-input v-model="listData.shopTel"/>
+      <el-form-item label="楼层" prop="houseLevel">
+         <el-input v-model="listData.houseLevel"/>
+      </el-form-item>
+      <el-form-item label="特色标签" prop="houseLabel">
+        <el-input v-model="listData.houseLabel"/>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="houseTel">
+        <el-input v-model="listData.houseTel"/>
       </el-form-item>
-      <el-form-item label="商铺地址" prop="shopAddress">
-        <el-input v-model="listData.shopAddress"/>
+      <el-form-item label="小区地址" prop="communityAddress">
+        <el-input v-model="listData.communityAddress"/>
       </el-form-item>
-      <el-form-item label="人均消费" prop="averagePrice">
-        <el-input v-model="listData.averagePrice"/>
+      <el-form-item label="房屋配套">
+        <el-checkbox v-model="listData.bed" true-label="1" false-label="0">床</el-checkbox>
+        <el-checkbox v-model="listData.mattress" true-label="1" false-label="0">床垫</el-checkbox>
+        <el-checkbox v-model="listData.wardrobe" true-label="1" false-label="0">衣柜</el-checkbox>
+        <el-checkbox v-model="listData.sofa" true-label="1" false-label="0">沙发</el-checkbox>
+        <el-checkbox v-model="listData.washingMachine" true-label="1" false-label="0">洗衣机</el-checkbox>
+        <el-checkbox v-model="listData.airConditioning" true-label="1" false-label="0">空调</el-checkbox>
+        <el-checkbox v-model="listData.fridge" true-label="1" false-label="0">冰箱</el-checkbox>
+        <el-checkbox v-model="listData.TV" true-label="1" false-label="0">电视</el-checkbox>
+        <el-checkbox v-model="listData.smartLock" true-label="1" false-label="0">智能锁</el-checkbox>
+        <el-checkbox v-model="listData.waterHeater" true-label="1" false-label="0">热水器</el-checkbox>
+        <el-checkbox v-model="listData.desk" true-label="1" false-label="0">桌子</el-checkbox>
+        <el-checkbox v-model="listData.chair" true-label="1" false-label="0">椅子</el-checkbox>
+        <el-checkbox v-model="listData.WiFi" true-label="1" false-label="0">网络</el-checkbox>
+        <el-checkbox v-model="listData.kitchen" true-label="1" false-label="0">厨房</el-checkbox>
+        <el-checkbox v-model="listData.bathroom" true-label="1" false-label="0">独卫</el-checkbox>
+        <el-checkbox v-model="listData.balcony" true-label="1" false-label="0">阳台</el-checkbox>
       </el-form-item>
       <el-form-item label="高德坐标">
-        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
-        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+        <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
@@ -82,7 +103,7 @@
           </el-amap>
         </div>
       </el-form-item>
-      <el-form-item label="商铺介绍">
+      <el-form-item label="房间介绍">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
             <wangeditor @wangeditorEvent="wangeditorValue"/>
@@ -107,25 +128,43 @@ export default {
       events: {
         click: e => {
           // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
-          this.listData.shopLongitude = e.lnglat.lng
-          this.listData.shopLatitude = e.lnglat.lat
+          this.listData.communityLongitude = e.lnglat.lng
+          this.listData.communityLatitude = e.lnglat.lat
         }
       },
       listData: {
-        shopName: '',
-        remark: '',
-        appIndexImg: '',
+        houseName: '',
+        rentalPrice: '',
+        area: '',
         appListImg: '',
         appCarouselImg: [],
+        houseType: '',
+        rentalType: '',
+        houseStatus: '',
+        houseLevel: '',
+        houseLabel: '',
         sort: '',
-        shopTypeId: '',
-        shopStatus: '',
-        shopTel: '',
-        shopAddress: '',
-        averagePrice: '',
-        shopLongitude: '',
-        shopLatitude: '',
-        shopIntroduction: ''
+        houseTel: '',
+        communityAddress: '',
+        communityLongitude: '',
+        communityLatitude: '',
+        houseIntroduction: '',
+        bed: '',
+        mattress: '',
+        wardrobe: '',
+        sofa: '',
+        washingMachine: '',
+        airConditioning: '',
+        fridge: '',
+        TV: '',
+        smartLock: '',
+        waterHeater: '',
+        desk: '',
+        chair: '',
+        WiFi: '',
+        kitchen: '',
+        bathroom: '',
+        balcony: ''
       },
       dialogImageUrl: '',
       dialogVisible: false,
@@ -139,32 +178,22 @@ export default {
       mapCenter: [118.789509, 32.019989],
       tableKey: 0,
       rules: {
-        typeName: [
-          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        houseName: [
+          { required: true, message: '请输入房间名称', trigger: 'blur' }
         ],
-        remark: [
-          { required: true, message: '请输入商铺说明', trigger: 'blur' }
-        ],
-        shopTel: [
+        houseTel: [
           { required: true, message: '请输入联系电话', trigger: 'blur' }
         ],
-        shopAddress: [
-          { required: true, message: '请输入商铺地址', trigger: 'blur' }
-        ],
-        appIndexImg: [
-          { required: true, message: 'app首页展示图', trigger: 'blur' }
-        ],
         appListImg: [
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
         appCarouselImg: [
-          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+          { required: true, message: '轮播图', trigger: 'blur' }
         ],
       }
     }
   },
   mounted() {
-    this.getShopTypeList()
   },
   methods: {
      addMarker() {
@@ -194,13 +223,6 @@ export default {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
-    getShopTypeList() {
-      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
-        this.shopTypeList = res.data
-      }).catch(() => {
-        console.log('error ListAnnouncement')
-      })
-    },
     onSearchResult(pois) {
       // 搜索地图
       let latSum = 0
@@ -220,12 +242,12 @@ export default {
       }
     },
     wangeditorValue(value) {
-      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+      this.listData.houseIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
     },
     submitForm(formName) { // 提交
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.addShop()
+          this.addRental()
         } else {
           console.log('error submit!!')
           return false
@@ -241,7 +263,7 @@ export default {
       console.log(this.isRegistered)
       this.$refs[formName].resetFields()
     },
-    addShop() {
+    addRental() {
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -249,13 +271,13 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.$store.dispatch('shopType/AddShop', this.listData).then((res) => {
+      this.$store.dispatch('rental/AddRental', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: res.message,
             type: 'success'
           })
-          this.$router.push({ name: 'shop-index' })
+          this.$router.push({ name: 'rental-index' })
           loading.close()
           return
         }
@@ -263,7 +285,7 @@ export default {
         loading.close()
       }).catch(() => {
         loading.close()
-        console.log('error AddBuilding')
+        console.log('error addRental')
       })
     }
   }

VUECODE/smart-property-manage/src/views/rental/rentalEdit.vue

@@ -1,23 +1,14 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
-      <el-form-item label="商铺名称" prop="shopName">
-        <el-input v-model="listData.shopName"/>
+      <el-form-item label="房间名称" prop="houseName">
+        <el-input v-model="listData.houseName"/>
       </el-form-item>
-      <el-form-item label="商铺说明" prop="remark">
-        <el-input v-model="listData.remark"/>
+      <el-form-item label="房间租金" prop="rentalPrice">
+        <el-input v-model="listData.rentalPrice"/>
       </el-form-item>
-      <el-form-item label="app首页展示图" prop="appIndexImg">
-        <el-upload
-          class="avatar-uploader"
-          name="uploadFiles"
-          :action="uploadImgUrl"
-          :show-file-list="false"
-          :on-success="handleAppIndexSuccess"
-          :before-upload="beforeAvatarUpload">
-          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
-          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-        </el-upload>
+      <el-form-item label="面积" prop="area">
+        <el-input v-model="listData.area"/>
       </el-form-item>
       <el-form-item label="app列表展示图" prop="appListImg">
         <el-upload
@@ -31,13 +22,27 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+      <el-form-item label="户型" prop="houseType">
+        <el-select v-model="listData.houseType" placeholder="请选择">
+            <el-option label="一室居" value="1"/>
+            <el-option label="二室居" value="2"/>
+            <el-option label="三室居" value="3"/>
+            <el-option label="四室居及以上" value="4"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="租赁方式" prop="rentalType">
+        <el-select v-model="listData.rentalType" placeholder="请选择">
+            <el-option label="整租" value="1"/>
+            <el-option label="合租" value="2"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="轮播图" prop="appCarouselImg">
         <el-upload
           name="uploadFiles"
           :limit="6"
+          :file-list="displayAppCarouselImg"
           :action="uploadImgUrl"
           list-type="picture-card"
-          :file-list="displayAppCarouselImg"
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
           :on-success="handleSuccessCarouselImg">
@@ -47,32 +52,48 @@
           <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="权重" prop="sort">
-        <el-input v-model="listData.sort"/>
-      </el-form-item>
-      <el-form-item label="商铺类型" prop="shopTypeId">
-        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
-          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="上架状态" prop="shopStatus">
-        <el-select v-model="listData.shopStatus" placeholder="请选择">
+      <el-form-item label="上架状态" prop="houseStatus">
+        <el-select v-model="listData.houseStatus" placeholder="请选择">
           <el-option label="已上架" value="1"/>
           <el-option label="已下架" value="2"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="联系电话" prop="shopTel">
-        <el-input v-model="listData.shopTel"/>
+      <el-form-item label="楼层" prop="houseLevel">
+         <el-input v-model="listData.houseLevel"/>
+      </el-form-item>
+      <el-form-item label="特色标签" prop="houseLabel">
+        <el-input v-model="listData.houseLabel"/>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
       </el-form-item>
-      <el-form-item label="商铺地址" prop="shopAddress">
-        <el-input v-model="listData.shopAddress"/>
+      <el-form-item label="联系电话" prop="houseTel">
+        <el-input v-model="listData.houseTel"/>
       </el-form-item>
-      <el-form-item label="人均消费" prop="averagePrice">
-        <el-input v-model="listData.averagePrice"/>
+      <el-form-item label="小区地址" prop="communityAddress">
+        <el-input v-model="listData.communityAddress"/>
+      </el-form-item>
+      <el-form-item label="房屋配套">
+        <el-checkbox v-model="listData.bed" true-label="1" false-label="0">床</el-checkbox>
+        <el-checkbox v-model="listData.mattress" true-label="1" false-label="0">床垫</el-checkbox>
+        <el-checkbox v-model="listData.wardrobe" true-label="1" false-label="0">衣柜</el-checkbox>
+        <el-checkbox v-model="listData.sofa" true-label="1" false-label="0">沙发</el-checkbox>
+        <el-checkbox v-model="listData.washingMachine" true-label="1" false-label="0">洗衣机</el-checkbox>
+        <el-checkbox v-model="listData.airConditioning" true-label="1" false-label="0">空调</el-checkbox>
+        <el-checkbox v-model="listData.fridge" true-label="1" false-label="0">冰箱</el-checkbox>
+        <el-checkbox v-model="listData.tv" true-label="1" false-label="0">电视</el-checkbox>
+        <el-checkbox v-model="listData.smartLock" true-label="1" false-label="0">智能锁</el-checkbox>
+        <el-checkbox v-model="listData.waterHeater" true-label="1" false-label="0">热水器</el-checkbox>
+        <el-checkbox v-model="listData.desk" true-label="1" false-label="0">桌子</el-checkbox>
+        <el-checkbox v-model="listData.chair" true-label="1" false-label="0">椅子</el-checkbox>
+        <el-checkbox v-model="listData.wiFi" true-label="1" false-label="0">网络</el-checkbox>
+        <el-checkbox v-model="listData.kitchen" true-label="1" false-label="0">厨房</el-checkbox>
+        <el-checkbox v-model="listData.bathroom" true-label="1" false-label="0">独卫</el-checkbox>
+        <el-checkbox v-model="listData.balcony" true-label="1" false-label="0">阳台</el-checkbox>
       </el-form-item>
       <el-form-item label="高德坐标">
-        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
-        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+        <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
@@ -83,10 +104,10 @@
           </el-amap>
         </div>
       </el-form-item>
-      <el-form-item label="商铺介绍">
+      <el-form-item label="房间介绍">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
-            <wangeditor :content="listData.shopIntroduction" @wangeditorEvent="wangeditorValue"/>
+            <wangeditor :content="listData.houseIntroduction" @wangeditorEvent="wangeditorValue"/>
           </div>
         </el-form-item>
       <el-form-item>
@@ -107,32 +128,49 @@ export default {
       events: {
         click: e => {
           // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
-          this.listData.shopLongitude = e.lnglat.lng
-          this.listData.shopLatitude = e.lnglat.lat
+          this.listData.communityLongitude = e.lnglat.lng
+          this.listData.communityLatitude = e.lnglat.lat
         }
       },
       listData: {
-        id: '',
-        shopName: '',
-        remark: '',
-        appIndexImg: '',
+        houseName: '',
+        rentalPrice: '',
+        area: '',
         appListImg: '',
         appCarouselImg: [],
+        houseType: '',
+        rentalType: '',
+        houseStatus: '',
+        houseLevel: '',
+        houseLabel: '',
         sort: '',
-        shopTypeId: '',
-        shopStatus: '',
-        shopTel: '',
-        shopAddress: '',
-        averagePrice: '',
-        shopLongitude: '',
-        shopLatitude: '',
-        shopIntroduction: ''
+        houseTel: '',
+        communityAddress: '',
+        communityLongitude: '',
+        communityLatitude: '',
+        houseIntroduction: '',
+        bed: '',
+        mattress: '',
+        wardrobe: '',
+        sofa: '',
+        washingMachine: '',
+        airConditioning: '',
+        fridge: '',
+        tv: '',
+        smartLock: '',
+        waterHeater: '',
+        desk: '',
+        chair: '',
+        wiFi: '',
+        kitchen: '',
+        bathroom: '',
+        balcony: ''
       },
-      displayAppCarouselImg: [],
       dialogImageUrl: '',
       dialogVisible: false,
       uploadImgUrl: process.env.BASE_API + '/uploadimage',
       markers: [],
+      displayAppCarouselImg: [],
       shopTypeList: [],
       searchOption: {
         city: '南京',
@@ -141,26 +179,17 @@ export default {
       mapCenter: [118.789509, 32.019989],
       tableKey: 0,
       rules: {
-        typeName: [
-          { required: true, message: '请输入商铺名称', trigger: 'blur' }
-        ],
-        remark: [
-          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        houseName: [
+          { required: true, message: '请输入房间名称', trigger: 'blur' }
         ],
-        shopTel: [
+        houseTel: [
           { required: true, message: '请输入联系电话', trigger: 'blur' }
         ],
-        shopAddress: [
-          { required: true, message: '请输入商铺地址', trigger: 'blur' }
-        ],
-        appIndexImg: [
-          { required: true, message: 'app首页展示图', trigger: 'blur' }
-        ],
         appListImg: [
           { required: true, message: 'app列表展示图', trigger: 'blur' }
         ],
         appCarouselImg: [
-          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+          { required: true, message: '轮播图', trigger: 'blur' }
         ],
       }
     }
@@ -168,7 +197,6 @@ export default {
   created() {
     this.listData.id = this.$route.query.id
     this.getById()
-    this.getShopTypeList()
   },
   methods: {
      addMarker() {
@@ -177,13 +205,14 @@ export default {
       this.markers.push([lng, lat])
     },
     getById() {
-      this.$store.dispatch('shopType/GetShop', this.listData.id).then((res) => {
-        const shopData = res.data
-        this.listData = shopData
-        alert(this.listData.shopIntroduction)
+      this.$store.dispatch('rental/GetRental', this.listData.id).then((res) => {
+        const rentalData = res.data
+        console.log(rentalData)
+        this.listData = { ...rentalData }
+        
         // 多张图片进行遍历
-        for (let i = 0; i < shopData.appCarouselImg.length; i++) {
-          this.displayAppCarouselImg.push({ url: shopData.appCarouselImg[i] })
+        for (let i = 0; i < rentalData.appCarouselImg.length; i++) {
+          this.displayAppCarouselImg.push({ url: rentalData.appCarouselImg[i] })
         }
       })
     },
@@ -209,13 +238,6 @@ export default {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
-    getShopTypeList() {
-      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
-        this.shopTypeList = res.data
-      }).catch(() => {
-        console.log('error ListAnnouncement')
-      })
-    },
     onSearchResult(pois) {
       // 搜索地图
       let latSum = 0
@@ -235,12 +257,12 @@ export default {
       }
     },
     wangeditorValue(value) {
-      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+      this.listData.houseIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
     },
     submitForm(formName) { // 提交
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.updateShop()
+          this.updateRental()
         } else {
           console.log('error submit!!')
           return false
@@ -256,7 +278,7 @@ export default {
       console.log(this.isRegistered)
       this.$refs[formName].resetFields()
     },
-    updateShop() {
+    updateRental() {
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -264,13 +286,13 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.$store.dispatch('shopType/UpdateShop', this.listData).then((res) => {
+      this.$store.dispatch('rental/UpdateRental', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: res.message,
             type: 'success'
           })
-          this.$router.push({ name: 'shop-index' })
+          this.$router.push({ name: 'rental-index' })
           loading.close()
           return
         }
@@ -278,7 +300,7 @@ export default {
         loading.close()
       }).catch(() => {
         loading.close()
-        console.log('error UpdateShop')
+        console.log('error addRental')
       })
     }
   }

VUECODE/smart-property-manage/src/views/rental/rentalIndex.vue

@@ -6,22 +6,22 @@
         <el-input v-model.trim="listQuery.id" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="房间编号" />
       </el-form-item>
       <el-form-item class="filter-item" label="房间名称" >
-        <el-input v-model.trim="listQuery.shopName" placeholder="房间名称" />
+        <el-input v-model.trim="listQuery.houseName" placeholder="房间名称" />
       </el-form-item>
       <el-form-item class="filter-item" label="租金从" >
-        <el-input v-model.trim="listQuery.shopName" placeholder="租金从" />
+        <el-input v-model.trim="listQuery.startPrice" placeholder="租金从" />
       </el-form-item>
       <el-form-item class="filter-item" label="到" >
-        <el-input v-model.trim="listQuery.shopName" placeholder="到" />
+        <el-input v-model.trim="listQuery.endPrice" placeholder="到" />
       </el-form-item>
       <el-form-item class="filter-item" label="租赁方式" >
-        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+        <el-select v-model="listQuery.rentalType" placeholder="请选择">
             <el-option label="整租" value="1"/>
             <el-option label="合租" value="2"/>
           </el-select>
       </el-form-item>
       <el-form-item class="filter-item" label="户型" >
-        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+        <el-select v-model="listQuery.houseType" placeholder="请选择">
             <el-option label="一室居" value="1"/>
             <el-option label="二室居" value="2"/>
             <el-option label="三室居" value="3"/>
@@ -29,7 +29,7 @@
           </el-select>
       </el-form-item>
       <el-form-item class="filter-item" label="上架状态" >
-        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+        <el-select v-model="listQuery.houseStatus" placeholder="请选择">
             <el-option label="已上架" value="1"/>
             <el-option label="已下架" value="2"/>
           </el-select>
@@ -42,8 +42,8 @@
     <div class="button">
       <el-button type="primary" @click="add">添加</el-button>
       <el-button type="warning" @click="edit">修改</el-button>
-      <el-button type="danger" @click="shelfShop">上架房间</el-button>
-      <el-button type="danger" @click="obtainedShop">下架房间</el-button>
+      <el-button type="danger" @click="shelfRental">上架房间</el-button>
+      <el-button type="danger" @click="obtainedRental">下架房间</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -57,29 +57,29 @@
         type="selection"
         width="55"/>
       <el-table-column prop="id" label="房间编号" align="center"/>
-      <el-table-column prop="shopName" label="房间名称" align="center" >
-        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.shopName }}</span></a></template>
+      <el-table-column prop="houseName" label="房间名称" align="center" >
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.houseName }}</span></a></template>
       </el-table-column>
       <el-table-column prop="sort" label="权重" align="center"/>
-      <el-table-column prop="typeName" label="租金" align="center"/>
-      <el-table-column prop="shopStatus" label="上架状态" align="center">\
+      <el-table-column prop="rentalPrice" label="租金" align="center"/>
+      <el-table-column prop="houseStatus" label="上架状态" align="center">\
         <template slot-scope="scope">
-          <span v-if="scope.row.shopStatus === '1'">已上架</span>
-          <span v-if="scope.row.shopStatus === '2'">已下架</span>
+          <span v-if="scope.row.houseStatus === '1'">已上架</span>
+          <span v-if="scope.row.houseStatus === '2'">已下架</span>
         </template>
       </el-table-column>
-      <el-table-column prop="shopStatus" label="租赁方式" align="center">\
+      <el-table-column prop="rentalType" label="租赁方式" align="center">\
         <template slot-scope="scope">
-          <span v-if="scope.row.shopStatus === '1'">整租</span>
-          <span v-if="scope.row.shopStatus === '2'">合租</span>
+          <span v-if="scope.row.rentalType === '1'">整租</span>
+          <span v-if="scope.row.rentalType === '2'">合租</span>
         </template>
       </el-table-column>
-      <el-table-column prop="shopStatus" label="户型" align="center">\
+      <el-table-column prop="houseType" label="户型" align="center">\
         <template slot-scope="scope">
-          <span v-if="scope.row.shopStatus === '1'">一室居</span>
-          <span v-if="scope.row.shopStatus === '2'">二室居</span>
-          <span v-if="scope.row.shopStatus === '3'">三室居</span>
-          <span v-if="scope.row.shopStatus === '4'">四室居及以上</span>
+          <span v-if="scope.row.houseType === '1'">一室居</span>
+          <span v-if="scope.row.houseType === '2'">二室居</span>
+          <span v-if="scope.row.houseType === '3'">三室居</span>
+          <span v-if="scope.row.houseType === '4'">四室居及以上</span>
         </template>
       </el-table-column>
       <el-table-column prop="updateDate" label="编辑时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
@@ -106,14 +106,17 @@ export default {
     return {
       listQuery: {
         id: '',
-        shopName: '',
-        shopTypeId: '',
-        shopStatus: '',
+        houseName: '',
+        startPrice: '',
+        endPrice: '',
+        rentalType: '',
+        houseType: '',
+        houseStatus: '',
         pageNum: 1,
         pageSize: 10
       },
       total: 0, // 数据总数
-      shopList: [],
+      rentalList: [],
       shopTypeList: [],
       deleteIds: [], // 选择的id集合
       listLoading: true // 加载圈
@@ -122,11 +125,10 @@ export default {
   mounted() {
     // 获取数据
     this.dataQuery()
-    this.getShopTypeList()
   },
   methods: {
-    ...mapActions('shopType', [
-      'FetchShopList',
+    ...mapActions('rental', [
+      'FetchRentalList',
       'FetchShopTypeSelect'
     ]),
     handleSizeChange(val) {
@@ -168,7 +170,7 @@ export default {
     },
     dataQuery() { // 查询数据
       this.listLoading = true
-      this.$store.dispatch('shopType/FetchShopList', this.listQuery).then((res) => {
+      this.$store.dispatch('rental/FetchRentalList', this.listQuery).then((res) => {
         const resData = res.data
         this.rentalList = resData.list
         this.total = resData.total
@@ -178,13 +180,6 @@ export default {
         console.log('error ListAnnouncement')
       })
     },
-    getShopTypeList() {
-      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listQuery).then((res) => {
-        this.shopTypeList = res.data
-      }).catch(() => {
-        console.log('error ListAnnouncement')
-      })
-    },
     handleSelectionChange(data) {
       // 设置为 空
       this.deleteIds = []
@@ -200,14 +195,17 @@ export default {
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 10
       this.listQuery.id =''
-      this.listQuery.shopName=''
-      this.listQuery.shopTypeId=''
-      this.listQuery.shopStatus=''
+      this.listQuery.houseName = '',
+      this.listQuery.startPrice = '',
+      this.listQuery.endPrice = '',
+      this.listQuery.rentalType = '',
+      this.listQuery.houseType = '',
+      this.listQuery.houseStatus = '',
       this.dataQuery()
     },
     // 添加公告
     add() {
-      this.$router.push({ name: 'shop-add' })
+      this.$router.push({ name: 'rental-add' })
     },
     edit(){// 编辑公告
       const ids = this.deleteIds
@@ -221,7 +219,7 @@ export default {
       }
        let ide= this.deleteIds[0]
        this.listQuery.id = ide
-       this.$router.push({ name: 'shop-edit', query: { id: ide }})
+       this.$router.push({ name: 'rental-edit', query: { id: ide }})
       },
     deleteAnnouncement(){
        let ide= this.deleteIds[0]
@@ -239,14 +237,14 @@ export default {
         this.deleteId()     
       })    
     },
-    shelfShop() {
+    shelfRental() {
       this.listLoading = true
       const ids = this.deleteIds
       if (ids < 1) {
         this.$message.error('请至少选择一行数据上架!')
         return
       }
-      this.$store.dispatch('shopType/ShelfShop', ids).then((res) => {
+      this.$store.dispatch('rental/ShelfRental', ids).then((res) => {
         this.listLoading = false
         this.dataQuery()
       }).catch(() => {
@@ -254,14 +252,14 @@ export default {
         console.log('error DeleteAnnouncement')
       })
     },
-    obtainedShop() {
+    obtainedRental() {
       this.listLoading = true
       const ids = this.deleteIds
       if (ids < 1) {
         this.$message.error('请至少选择一行数据下架!')
         return
       }
-      this.$store.dispatch('shopType/ObtainedShop', ids).then((res) => {
+      this.$store.dispatch('rental/ObtainedRental', ids).then((res) => {
         this.listLoading = false
         this.dataQuery()
       }).catch(() => {
@@ -285,7 +283,7 @@ export default {
 
 
     clickTitle(id) {
-      this.$router.push({ name: 'shop-edit', query: { id: id }})
+      this.$router.push({ name: 'rental-edit', query: { id: id }})
     },
     formatDate(val) {
       if (val === null) {

VUECODE/smart-property-manage/src/views/shop/shopSettingEdit.vue

@@ -5,7 +5,7 @@
         <el-input v-model="listQuery.typeName" style="width: 200px;"/>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="listQuery.sort" style="width: 200px;"/>
+        <el-input v-model="listQuery.sort" :disabled="listQuery.isSys" style="width: 200px;"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
@@ -21,7 +21,8 @@ export default {
       listQuery: {
         id: '',
         typeName: '',
-        sort: ''
+        sort: '',
+        isSys: false
       },
       rules: {
         typeName: [
@@ -60,6 +61,11 @@ export default {
         const typeData = res.data
         this.listQuery.typeName = typeData.typeName
         this.listQuery.sort = typeData.sort
+        let state = false
+        if(typeData.source === "sys"){
+          state = true
+        }
+        this.listQuery.isSys = state
       })
     },
     updateBuilding() {

文档/MYSQL/smartCommunity.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1557800706" Name="smartCommunity" Objects="1160" Symbols="129" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1557813818" Name="smartCommunity" Objects="1162" Symbols="129" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -6979,7 +6979,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1557303510</a:CreationDate>
 <a:ModificationDate>1557306066</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((187327,19260), (204115,48658))</a:Rect>
+<a:Rect>((187327,18810), (204115,49108))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -7104,7 +7104,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1557800506</a:CreationDate>
 <a:ModificationDate>1557800506</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((192811,-14911), (207867,-9813))</a:Rect>
+<a:Rect>((192811,-15361), (207867,-9363))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -17524,7 +17524,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>tp_rental_house</a:Code>
 <a:CreationDate>1557303510</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557813818</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>出租公寓表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -17543,6 +17543,18 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o1021">
+<a:ObjectID>8AE70562-18C0-45C6-BF15-FCAA422F59C2</a:ObjectID>
+<a:Name>community_id</a:Name>
+<a:Code>community_id</a:Code>
+<a:CreationDate>1557813774</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557813818</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>我们系统的小区ID</a:Comment>
+<a:DataType>int(11)</a:DataType>
+<a:Length>11</a:Length>
+</o:Column>
+<o:Column Id="o1022">
 <a:ObjectID>51C7C13C-E338-45B0-A4E6-3F88B2DE7F33</a:ObjectID>
 <a:Name>house_name</a:Name>
 <a:Code>house_name</a:Code>
@@ -17554,7 +17566,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1022">
+<o:Column Id="o1023">
 <a:ObjectID>CB9AD670-AD18-4424-9385-AB1105DCE3CB</a:ObjectID>
 <a:Name>rental_price</a:Name>
 <a:Code>rental_price</a:Code>
@@ -17566,7 +17578,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1023">
+<o:Column Id="o1024">
 <a:ObjectID>2D4C03FA-18B3-4835-A768-0BF06B6674B2</a:ObjectID>
 <a:Name>area</a:Name>
 <a:Code>area</a:Code>
@@ -17578,7 +17590,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1024">
+<o:Column Id="o1025">
 <a:ObjectID>DE4B7575-2E0F-4439-BB2E-7B293918BCFF</a:ObjectID>
 <a:Name>rental_type</a:Name>
 <a:Code>rental_type</a:Code>
@@ -17590,7 +17602,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1025">
+<o:Column Id="o1026">
 <a:ObjectID>09D9CD83-643E-407F-B521-D0B808271727</a:ObjectID>
 <a:Name>house_type</a:Name>
 <a:Code>house_type</a:Code>
@@ -17602,7 +17614,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1026">
+<o:Column Id="o1027">
 <a:ObjectID>CF14CF64-1763-4792-8D75-D010840925A8</a:ObjectID>
 <a:Name>house_status</a:Name>
 <a:Code>house_status</a:Code>
@@ -17614,7 +17626,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1027">
+<o:Column Id="o1028">
 <a:ObjectID>F676264A-1683-4D62-BBB4-F18F705B4C63</a:ObjectID>
 <a:Name>house_level</a:Name>
 <a:Code>house_level</a:Code>
@@ -17626,7 +17638,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1028">
+<o:Column Id="o1029">
 <a:ObjectID>D56459F7-EC5C-4508-84C0-4BBEF2ADA53D</a:ObjectID>
 <a:Name>house_label</a:Name>
 <a:Code>house_label</a:Code>
@@ -17638,7 +17650,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1029">
+<o:Column Id="o1030">
 <a:ObjectID>C9B94A82-C5AA-4826-9909-E564BF1B5E0A</a:ObjectID>
 <a:Name>sort</a:Name>
 <a:Code>sort</a:Code>
@@ -17650,7 +17662,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1030">
+<o:Column Id="o1031">
 <a:ObjectID>9B121749-83C8-4367-8A35-1D05D64102B1</a:ObjectID>
 <a:Name>house_tel</a:Name>
 <a:Code>house_tel</a:Code>
@@ -17662,7 +17674,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1031">
+<o:Column Id="o1032">
 <a:ObjectID>FE137449-0BEF-4A20-AC8F-475CA8BF4F2E</a:ObjectID>
 <a:Name>community_address</a:Name>
 <a:Code>community_address</a:Code>
@@ -17674,7 +17686,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1032">
+<o:Column Id="o1033">
 <a:ObjectID>34B0089B-9EA6-436B-B236-B087A3CE73E5</a:ObjectID>
 <a:Name>community_longitude</a:Name>
 <a:Code>community_longitude</a:Code>
@@ -17686,7 +17698,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1033">
+<o:Column Id="o1034">
 <a:ObjectID>A62ABB38-54CD-4F47-8C17-D1A9342DD8FC</a:ObjectID>
 <a:Name>community_latitude</a:Name>
 <a:Code>community_latitude</a:Code>
@@ -17698,7 +17710,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1034">
+<o:Column Id="o1035">
 <a:ObjectID>1E5C86EA-7B19-497D-BDDE-96EA66DF905F</a:ObjectID>
 <a:Name>house_introduction</a:Name>
 <a:Code>house_introduction</a:Code>
@@ -17709,7 +17721,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>房屋介绍</a:Comment>
 <a:DataType>text</a:DataType>
 </o:Column>
-<o:Column Id="o1035">
+<o:Column Id="o1036">
 <a:ObjectID>C505FCE6-7EF3-4451-8A34-0A61EC7FE8E0</a:ObjectID>
 <a:Name>bed</a:Name>
 <a:Code>bed</a:Code>
@@ -17721,7 +17733,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1036">
+<o:Column Id="o1037">
 <a:ObjectID>86AC4B40-FEBD-4FCB-A079-23ED794287E7</a:ObjectID>
 <a:Name>wardrobe</a:Name>
 <a:Code>wardrobe</a:Code>
@@ -17733,7 +17745,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1037">
+<o:Column Id="o1038">
 <a:ObjectID>0F598383-042D-42FD-B7DD-5EAD70E46C1B</a:ObjectID>
 <a:Name>dining_table</a:Name>
 <a:Code>dining_table</a:Code>
@@ -17745,7 +17757,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1038">
+<o:Column Id="o1039">
 <a:ObjectID>7FB29743-6F55-4ADD-829C-886CD8235B78</a:ObjectID>
 <a:Name>computer_desk</a:Name>
 <a:Code>computer_desk</a:Code>
@@ -17757,7 +17769,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1039">
+<o:Column Id="o1040">
 <a:ObjectID>BD673A93-F61B-4C96-BEAD-2283ACDFAF64</a:ObjectID>
 <a:Name>water_heater</a:Name>
 <a:Code>water_heater</a:Code>
@@ -17769,7 +17781,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1040">
+<o:Column Id="o1041">
 <a:ObjectID>4F881349-E1A5-4DE0-8010-BC61A8DF88A3</a:ObjectID>
 <a:Name>chair</a:Name>
 <a:Code>chair</a:Code>
@@ -17781,7 +17793,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1041">
+<o:Column Id="o1042">
 <a:ObjectID>95D69A16-BEA6-4D93-AE71-BD1F110A4B26</a:ObjectID>
 <a:Name>washing_machine</a:Name>
 <a:Code>washing_machine</a:Code>
@@ -17793,7 +17805,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1042">
+<o:Column Id="o1043">
 <a:ObjectID>DD7E6C40-AD47-4864-AFFB-FBB0E8D9121B</a:ObjectID>
 <a:Name>air_conditioning</a:Name>
 <a:Code>air_conditioning</a:Code>
@@ -17805,7 +17817,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1043">
+<o:Column Id="o1044">
 <a:ObjectID>8F69DF57-D61E-47AB-8E05-BB0EBB0B5139</a:ObjectID>
 <a:Name>table_lamp</a:Name>
 <a:Code>table_lamp</a:Code>
@@ -17817,7 +17829,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1044">
+<o:Column Id="o1045">
 <a:ObjectID>0A425DF5-5766-4069-BD6E-771C1676BB85</a:ObjectID>
 <a:Name>WiFi</a:Name>
 <a:Code>WiFi</a:Code>
@@ -17829,7 +17841,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1045">
+<o:Column Id="o1046">
 <a:ObjectID>5CA481DC-A4C9-4723-B1E5-43F84387D203</a:ObjectID>
 <a:Name>microwave_oven</a:Name>
 <a:Code>microwave_oven</a:Code>
@@ -17841,7 +17853,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1046">
+<o:Column Id="o1047">
 <a:ObjectID>8100898B-1949-4F10-B73D-47B3D94A8826</a:ObjectID>
 <a:Name>natural_gas</a:Name>
 <a:Code>natural_gas</a:Code>
@@ -17853,7 +17865,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1047">
+<o:Column Id="o1048">
 <a:ObjectID>86966D69-2983-4EEE-B469-B2630F47E55E</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -17864,7 +17876,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1048">
+<o:Column Id="o1049">
 <a:ObjectID>0E612C68-BF9C-4454-889C-68B6A3CAF9CB</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -17876,7 +17888,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1049">
+<o:Column Id="o1050">
 <a:ObjectID>44888D0B-ED44-4152-A948-FE2738CD4730</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -17887,7 +17899,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1050">
+<o:Column Id="o1051">
 <a:ObjectID>9ACA9B2C-9A46-43EC-AB23-5DD83CED5EF2</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -17901,7 +17913,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1051">
+<o:Key Id="o1052">
 <a:ObjectID>148EAD21-CFA4-42E6-9F44-C31E1C508685</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -17915,7 +17927,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1051"/>
+<o:Key Ref="o1052"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o253">
@@ -17929,7 +17941,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>商铺图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1052">
+<o:Column Id="o1053">
 <a:ObjectID>92BB3B4E-28C8-452C-B070-4A0755DE3BBC</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -17942,7 +17954,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1053">
+<o:Column Id="o1054">
 <a:ObjectID>21087CE1-7882-4A27-ACD7-E1579649B207</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -17954,7 +17966,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1054">
+<o:Column Id="o1055">
 <a:ObjectID>6B2B261C-902C-41CE-848E-FF27C66FE85B</a:ObjectID>
 <a:Name>shop_id</a:Name>
 <a:Code>shop_id</a:Code>
@@ -17966,7 +17978,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1055">
+<o:Column Id="o1056">
 <a:ObjectID>1903CA52-9255-47A8-9B59-B8CA06D703E0</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
@@ -17978,7 +17990,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1056">
+<o:Column Id="o1057">
 <a:ObjectID>D12DC8AD-CF58-4DE5-A9DC-ABB63D349D13</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
@@ -17990,7 +18002,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1057">
+<o:Column Id="o1058">
 <a:ObjectID>5BC7B1D6-E34E-4473-9DF1-CA6240B1C23F</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18003,7 +18015,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1058">
+<o:Key Id="o1059">
 <a:ObjectID>6EEDA542-1E85-47A3-BC57-7C65558D93D0</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18012,12 +18024,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557304098</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1052"/>
+<o:Column Ref="o1053"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1058"/>
+<o:Key Ref="o1059"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o255">
@@ -18031,7 +18043,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>出租房间图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1059">
+<o:Column Id="o1060">
 <a:ObjectID>98ED7313-E915-44A1-9D4F-80F5BC057C88</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18044,7 +18056,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1060">
+<o:Column Id="o1061">
 <a:ObjectID>C9DD2C07-B914-4F63-AFCD-05FA9EEC9184</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18056,7 +18068,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1061">
+<o:Column Id="o1062">
 <a:ObjectID>B557681C-3BC2-492A-9313-38454B3D480A</a:ObjectID>
 <a:Name>rental_house_id</a:Name>
 <a:Code>rental_house_id</a:Code>
@@ -18068,7 +18080,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1062">
+<o:Column Id="o1063">
 <a:ObjectID>7EFF853D-17E5-459D-8942-60286B8BF991</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
@@ -18080,7 +18092,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1063">
+<o:Column Id="o1064">
 <a:ObjectID>986D1A7D-1053-4346-AD5C-D64AEE62DD3F</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
@@ -18092,7 +18104,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1064">
+<o:Column Id="o1065">
 <a:ObjectID>A094BD2C-60B5-4AC9-A98E-176D07F29C66</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18105,7 +18117,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1065">
+<o:Key Id="o1066">
 <a:ObjectID>F8E42723-01EE-48CA-B9B4-9B70D9EE52C2</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18114,12 +18126,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557307564</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1059"/>
+<o:Column Ref="o1060"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1065"/>
+<o:Key Ref="o1066"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o256">
@@ -18133,7 +18145,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>用户车牌号表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1066">
+<o:Column Id="o1067">
 <a:ObjectID>2ADC4DD9-6B52-46D7-80A7-0B269251996F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18146,7 +18158,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1067">
+<o:Column Id="o1068">
 <a:ObjectID>B2476244-EFC3-4FF8-A728-50D1941D12BB</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18158,7 +18170,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1068">
+<o:Column Id="o1069">
 <a:ObjectID>D4FE9889-F81C-40A2-9777-99934795E873</a:ObjectID>
 <a:Name>ta_user_id</a:Name>
 <a:Code>ta_user_id</a:Code>
@@ -18170,7 +18182,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1069">
+<o:Column Id="o1070">
 <a:ObjectID>9AF156AE-3592-4A2F-ADD4-AF7D94A024F2</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
@@ -18182,7 +18194,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1070">
+<o:Column Id="o1071">
 <a:ObjectID>4AF2667F-B53D-4CAB-9DF9-7388FD52766D</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
@@ -18194,7 +18206,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1071">
+<o:Column Id="o1072">
 <a:ObjectID>33679CF5-35FC-4B38-9BFA-D008AFEB89C3</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
@@ -18205,7 +18217,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1072">
+<o:Column Id="o1073">
 <a:ObjectID>57CE5A0C-2BD4-4B1F-AED4-D8FFB7C53768</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
@@ -18217,7 +18229,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1073">
+<o:Column Id="o1074">
 <a:ObjectID>593C14C2-DC52-447D-9901-15585EB3D25E</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
@@ -18229,7 +18241,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1074">
+<o:Column Id="o1075">
 <a:ObjectID>B11B597D-C188-4F86-B983-1247AAC74386</a:ObjectID>
 <a:Name>renew_time</a:Name>
 <a:Code>renew_time</a:Code>
@@ -18241,7 +18253,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1075">
+<o:Column Id="o1076">
 <a:ObjectID>B9A4F75B-5600-4E03-97CA-F52659AF4566</a:ObjectID>
 <a:Name>license_type</a:Name>
 <a:Code>license_type</a:Code>
@@ -18253,7 +18265,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1076">
+<o:Column Id="o1077">
 <a:ObjectID>00FA4FFC-5A5F-4873-881A-EA8B4C2639BD</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18264,7 +18276,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1077">
+<o:Column Id="o1078">
 <a:ObjectID>C3559530-E9AA-4BB9-A794-582963C4A4BF</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -18276,7 +18288,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1078">
+<o:Column Id="o1079">
 <a:ObjectID>AD4AC6D5-678E-49FC-93B0-BB84F617CD00</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -18287,7 +18299,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1079">
+<o:Column Id="o1080">
 <a:ObjectID>85836F40-5F4D-4AB8-9DC7-2345ED8AE5DA</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -18301,7 +18313,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1080">
+<o:Key Id="o1081">
 <a:ObjectID>63206026-120F-43C3-AF49-7BF7198EAA64</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18310,12 +18322,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557367718</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1066"/>
+<o:Column Ref="o1067"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1080"/>
+<o:Key Ref="o1081"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o257">
@@ -18329,7 +18341,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>月租车缴费订单表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1081">
+<o:Column Id="o1082">
 <a:ObjectID>08F36182-AB22-433F-8F51-E805E2ACC919</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18342,7 +18354,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1082">
+<o:Column Id="o1083">
 <a:ObjectID>45D65D52-E45F-466F-B13D-4BAB7431D881</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18354,7 +18366,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1083">
+<o:Column Id="o1084">
 <a:ObjectID>80318F85-BB20-4024-9998-D987A98B2C8F</a:ObjectID>
 <a:Name>user_license_id</a:Name>
 <a:Code>ta_user_id</a:Code>
@@ -18366,7 +18378,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1084">
+<o:Column Id="o1085">
 <a:ObjectID>63010136-6F76-4F2E-970D-D599445EE9B0</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
@@ -18378,7 +18390,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1085">
+<o:Column Id="o1086">
 <a:ObjectID>D575E6DD-CE84-4ED5-8208-C3C936932B7B</a:ObjectID>
 <a:Name>order_status</a:Name>
 <a:Code>order_status</a:Code>
@@ -18390,7 +18402,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1086">
+<o:Column Id="o1087">
 <a:ObjectID>2D0B1C89-FCE7-43EB-9E46-3814A128EAA1</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -18402,7 +18414,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1087">
+<o:Column Id="o1088">
 <a:ObjectID>A1476C8B-868D-4B30-ACD0-08C86C003A27</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18413,7 +18425,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1088">
+<o:Column Id="o1089">
 <a:ObjectID>BE3B494A-E8E4-421E-A871-FD700644271F</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -18425,7 +18437,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1089">
+<o:Column Id="o1090">
 <a:ObjectID>A34F3B8C-7F9A-41ED-BD96-44A95D08C547</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -18436,7 +18448,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1090">
+<o:Column Id="o1091">
 <a:ObjectID>8EA7049C-94A1-453E-B283-8E79F440BCEB</a:ObjectID>
 <a:Name>extension_month</a:Name>
 <a:Code>extension_month</a:Code>
@@ -18448,7 +18460,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1091">
+<o:Column Id="o1092">
 <a:ObjectID>749D6A1D-5072-45E8-9826-22579FD72F1F</a:ObjectID>
 <a:Name>extension_price</a:Name>
 <a:Code>extension_price</a:Code>
@@ -18460,7 +18472,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1092">
+<o:Column Id="o1093">
 <a:ObjectID>E0395793-A050-4735-96E3-F17749B36CEC</a:ObjectID>
 <a:Name>payment_tel</a:Name>
 <a:Code>payment_tel</a:Code>
@@ -18472,7 +18484,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1093">
+<o:Column Id="o1094">
 <a:ObjectID>3D0DBFAF-ACCA-4178-AEC7-478CABDABE68</a:ObjectID>
 <a:Name>payment_name</a:Name>
 <a:Code>payment_name</a:Code>
@@ -18484,7 +18496,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1094">
+<o:Column Id="o1095">
 <a:ObjectID>2C17C691-0E31-4CD5-A8A7-5D326BB722F7</a:ObjectID>
 <a:Name>payment_type</a:Name>
 <a:Code>payment_type</a:Code>
@@ -18496,7 +18508,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1095">
+<o:Column Id="o1096">
 <a:ObjectID>431D00B1-22B7-4183-9E3C-8DC9222B68A9</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
@@ -18507,7 +18519,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1096">
+<o:Column Id="o1097">
 <a:ObjectID>9D078A47-1407-4881-9BAC-287FC15BBEB6</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
@@ -18519,7 +18531,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1097">
+<o:Column Id="o1098">
 <a:ObjectID>F78B78EC-E859-47C1-AC9D-A3E1B0CBA926</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
@@ -18531,7 +18543,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1098">
+<o:Column Id="o1099">
 <a:ObjectID>9273BE9C-B9DC-4C92-AA4D-018829225523</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
@@ -18545,7 +18557,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1099">
+<o:Key Id="o1100">
 <a:ObjectID>F57D4E18-1528-44BD-BEBB-4680F3D77BDA</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18554,12 +18566,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557372945</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1081"/>
+<o:Column Ref="o1082"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1099"/>
+<o:Key Ref="o1100"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o259">
@@ -18568,12 +18580,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>ta_version</a:Code>
 <a:CreationDate>1557800506</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557800706</a:ModificationDate>
+<a:ModificationDate>1557800793</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>app端版本号</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1100">
+<o:Column Id="o1101">
 <a:ObjectID>A9874095-1A7A-41B3-BDAA-89FF219B226F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18585,7 +18597,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>11</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1101">
+<o:Column Id="o1102">
 <a:ObjectID>946CB4DD-6B85-465A-895E-5E8A8F2BA7C3</a:ObjectID>
 <a:Name>client_version</a:Name>
 <a:Code>client_version</a:Code>
@@ -18597,7 +18609,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1102">
+<o:Column Id="o1103">
 <a:ObjectID>BDFD3026-FC17-4D03-A503-7AF3A37592A5</a:ObjectID>
 <a:Name>service_version</a:Name>
 <a:Code>service_version</a:Code>
@@ -18609,7 +18621,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1103">
+<o:Column Id="o1104">
 <a:ObjectID>3D77C63D-552E-4815-8BBB-148013A10319</a:ObjectID>
 <a:Name>type</a:Name>
 <a:Code>type</a:Code>
@@ -18621,9 +18633,21 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
+<o:Column Id="o1105">
+<a:ObjectID>1414BD13-AA8D-4144-BA19-810AED96EE55</a:ObjectID>
+<a:Name>update_address</a:Name>
+<a:Code>update_address</a:Code>
+<a:CreationDate>1557800748</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557800793</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>升级地址</a:Comment>
+<a:DataType>varchar(255)</a:DataType>
+<a:Length>255</a:Length>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1104">
+<o:Key Id="o1106">
 <a:ObjectID>81BA3F75-E9E6-4FF0-BC41-4D8BAF735EDC</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18632,17 +18656,17 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557800616</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1100"/>
+<o:Column Ref="o1101"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1104"/>
+<o:Key Ref="o1106"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o1105">
+<o:Group Id="o1107">
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -19305,7 +19329,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o1106">
+<o:TargetModel Id="o1108">
 <a:ObjectID>B86EB932-C352-4174-86E4-2D2B1DDE4A45</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1557800793" Name="smartCommunity" Objects="1161" Symbols="129" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1557818754" Name="smartCommunity" Objects="1163" Symbols="129" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -6979,7 +6979,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1557303510</a:CreationDate>
 <a:ModificationDate>1557306066</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((187327,19260), (204115,48658))</a:Rect>
+<a:Rect>((187327,18360), (204115,49558))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -17524,7 +17524,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>tp_rental_house</a:Code>
 <a:CreationDate>1557303510</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1557307546</a:ModificationDate>
+<a:ModificationDate>1557818754</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>出租公寓表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -17543,6 +17543,18 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o1021">
+<a:ObjectID>8AE70562-18C0-45C6-BF15-FCAA422F59C2</a:ObjectID>
+<a:Name>community_id</a:Name>
+<a:Code>community_id</a:Code>
+<a:CreationDate>1557813774</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557813818</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>我们系统的小区ID</a:Comment>
+<a:DataType>int(11)</a:DataType>
+<a:Length>11</a:Length>
+</o:Column>
+<o:Column Id="o1022">
 <a:ObjectID>51C7C13C-E338-45B0-A4E6-3F88B2DE7F33</a:ObjectID>
 <a:Name>house_name</a:Name>
 <a:Code>house_name</a:Code>
@@ -17554,7 +17566,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1022">
+<o:Column Id="o1023">
 <a:ObjectID>CB9AD670-AD18-4424-9385-AB1105DCE3CB</a:ObjectID>
 <a:Name>rental_price</a:Name>
 <a:Code>rental_price</a:Code>
@@ -17566,7 +17578,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1023">
+<o:Column Id="o1024">
 <a:ObjectID>2D4C03FA-18B3-4835-A768-0BF06B6674B2</a:ObjectID>
 <a:Name>area</a:Name>
 <a:Code>area</a:Code>
@@ -17578,7 +17590,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1024">
+<o:Column Id="o1025">
 <a:ObjectID>DE4B7575-2E0F-4439-BB2E-7B293918BCFF</a:ObjectID>
 <a:Name>rental_type</a:Name>
 <a:Code>rental_type</a:Code>
@@ -17590,7 +17602,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1025">
+<o:Column Id="o1026">
 <a:ObjectID>09D9CD83-643E-407F-B521-D0B808271727</a:ObjectID>
 <a:Name>house_type</a:Name>
 <a:Code>house_type</a:Code>
@@ -17602,7 +17614,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1026">
+<o:Column Id="o1027">
 <a:ObjectID>CF14CF64-1763-4792-8D75-D010840925A8</a:ObjectID>
 <a:Name>house_status</a:Name>
 <a:Code>house_status</a:Code>
@@ -17614,7 +17626,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1027">
+<o:Column Id="o1028">
 <a:ObjectID>F676264A-1683-4D62-BBB4-F18F705B4C63</a:ObjectID>
 <a:Name>house_level</a:Name>
 <a:Code>house_level</a:Code>
@@ -17626,7 +17638,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1028">
+<o:Column Id="o1029">
 <a:ObjectID>D56459F7-EC5C-4508-84C0-4BBEF2ADA53D</a:ObjectID>
 <a:Name>house_label</a:Name>
 <a:Code>house_label</a:Code>
@@ -17638,7 +17650,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1029">
+<o:Column Id="o1030">
 <a:ObjectID>C9B94A82-C5AA-4826-9909-E564BF1B5E0A</a:ObjectID>
 <a:Name>sort</a:Name>
 <a:Code>sort</a:Code>
@@ -17650,7 +17662,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1030">
+<o:Column Id="o1031">
 <a:ObjectID>9B121749-83C8-4367-8A35-1D05D64102B1</a:ObjectID>
 <a:Name>house_tel</a:Name>
 <a:Code>house_tel</a:Code>
@@ -17662,7 +17674,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1031">
+<o:Column Id="o1032">
 <a:ObjectID>FE137449-0BEF-4A20-AC8F-475CA8BF4F2E</a:ObjectID>
 <a:Name>community_address</a:Name>
 <a:Code>community_address</a:Code>
@@ -17674,7 +17686,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1032">
+<o:Column Id="o1033">
 <a:ObjectID>34B0089B-9EA6-436B-B236-B087A3CE73E5</a:ObjectID>
 <a:Name>community_longitude</a:Name>
 <a:Code>community_longitude</a:Code>
@@ -17686,7 +17698,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1033">
+<o:Column Id="o1034">
 <a:ObjectID>A62ABB38-54CD-4F47-8C17-D1A9342DD8FC</a:ObjectID>
 <a:Name>community_latitude</a:Name>
 <a:Code>community_latitude</a:Code>
@@ -17698,7 +17710,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1034">
+<o:Column Id="o1035">
 <a:ObjectID>1E5C86EA-7B19-497D-BDDE-96EA66DF905F</a:ObjectID>
 <a:Name>house_introduction</a:Name>
 <a:Code>house_introduction</a:Code>
@@ -17709,7 +17721,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>房屋介绍</a:Comment>
 <a:DataType>text</a:DataType>
 </o:Column>
-<o:Column Id="o1035">
+<o:Column Id="o1036">
 <a:ObjectID>C505FCE6-7EF3-4451-8A34-0A61EC7FE8E0</a:ObjectID>
 <a:Name>bed</a:Name>
 <a:Code>bed</a:Code>
@@ -17721,7 +17733,19 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1036">
+<o:Column Id="o1037">
+<a:ObjectID>42F73021-2A57-4614-B1A8-3C713A84F54D</a:ObjectID>
+<a:Name>mattress</a:Name>
+<a:Code>mattress</a:Code>
+<a:CreationDate>1557818735</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1557818754</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>床垫 1 有</a:Comment>
+<a:DataType>varchar(1)</a:DataType>
+<a:Length>1</a:Length>
+</o:Column>
+<o:Column Id="o1038">
 <a:ObjectID>86AC4B40-FEBD-4FCB-A079-23ED794287E7</a:ObjectID>
 <a:Name>wardrobe</a:Name>
 <a:Code>wardrobe</a:Code>
@@ -17733,7 +17757,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1037">
+<o:Column Id="o1039">
 <a:ObjectID>0F598383-042D-42FD-B7DD-5EAD70E46C1B</a:ObjectID>
 <a:Name>dining_table</a:Name>
 <a:Code>dining_table</a:Code>
@@ -17745,7 +17769,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1038">
+<o:Column Id="o1040">
 <a:ObjectID>7FB29743-6F55-4ADD-829C-886CD8235B78</a:ObjectID>
 <a:Name>computer_desk</a:Name>
 <a:Code>computer_desk</a:Code>
@@ -17757,7 +17781,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1039">
+<o:Column Id="o1041">
 <a:ObjectID>BD673A93-F61B-4C96-BEAD-2283ACDFAF64</a:ObjectID>
 <a:Name>water_heater</a:Name>
 <a:Code>water_heater</a:Code>
@@ -17769,7 +17793,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1040">
+<o:Column Id="o1042">
 <a:ObjectID>4F881349-E1A5-4DE0-8010-BC61A8DF88A3</a:ObjectID>
 <a:Name>chair</a:Name>
 <a:Code>chair</a:Code>
@@ -17781,7 +17805,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1041">
+<o:Column Id="o1043">
 <a:ObjectID>95D69A16-BEA6-4D93-AE71-BD1F110A4B26</a:ObjectID>
 <a:Name>washing_machine</a:Name>
 <a:Code>washing_machine</a:Code>
@@ -17793,7 +17817,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1042">
+<o:Column Id="o1044">
 <a:ObjectID>DD7E6C40-AD47-4864-AFFB-FBB0E8D9121B</a:ObjectID>
 <a:Name>air_conditioning</a:Name>
 <a:Code>air_conditioning</a:Code>
@@ -17805,7 +17829,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1043">
+<o:Column Id="o1045">
 <a:ObjectID>8F69DF57-D61E-47AB-8E05-BB0EBB0B5139</a:ObjectID>
 <a:Name>table_lamp</a:Name>
 <a:Code>table_lamp</a:Code>
@@ -17817,7 +17841,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1044">
+<o:Column Id="o1046">
 <a:ObjectID>0A425DF5-5766-4069-BD6E-771C1676BB85</a:ObjectID>
 <a:Name>WiFi</a:Name>
 <a:Code>WiFi</a:Code>
@@ -17829,7 +17853,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1045">
+<o:Column Id="o1047">
 <a:ObjectID>5CA481DC-A4C9-4723-B1E5-43F84387D203</a:ObjectID>
 <a:Name>microwave_oven</a:Name>
 <a:Code>microwave_oven</a:Code>
@@ -17841,7 +17865,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1046">
+<o:Column Id="o1048">
 <a:ObjectID>8100898B-1949-4F10-B73D-47B3D94A8826</a:ObjectID>
 <a:Name>natural_gas</a:Name>
 <a:Code>natural_gas</a:Code>
@@ -17853,7 +17877,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o1047">
+<o:Column Id="o1049">
 <a:ObjectID>86966D69-2983-4EEE-B469-B2630F47E55E</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -17864,7 +17888,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1048">
+<o:Column Id="o1050">
 <a:ObjectID>0E612C68-BF9C-4454-889C-68B6A3CAF9CB</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -17876,7 +17900,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1049">
+<o:Column Id="o1051">
 <a:ObjectID>44888D0B-ED44-4152-A948-FE2738CD4730</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -17887,7 +17911,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1050">
+<o:Column Id="o1052">
 <a:ObjectID>9ACA9B2C-9A46-43EC-AB23-5DD83CED5EF2</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -17901,7 +17925,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1051">
+<o:Key Id="o1053">
 <a:ObjectID>148EAD21-CFA4-42E6-9F44-C31E1C508685</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -17915,7 +17939,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1051"/>
+<o:Key Ref="o1053"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o253">
@@ -17929,7 +17953,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>商铺图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1052">
+<o:Column Id="o1054">
 <a:ObjectID>92BB3B4E-28C8-452C-B070-4A0755DE3BBC</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -17942,7 +17966,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1053">
+<o:Column Id="o1055">
 <a:ObjectID>21087CE1-7882-4A27-ACD7-E1579649B207</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -17954,7 +17978,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1054">
+<o:Column Id="o1056">
 <a:ObjectID>6B2B261C-902C-41CE-848E-FF27C66FE85B</a:ObjectID>
 <a:Name>shop_id</a:Name>
 <a:Code>shop_id</a:Code>
@@ -17966,7 +17990,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1055">
+<o:Column Id="o1057">
 <a:ObjectID>1903CA52-9255-47A8-9B59-B8CA06D703E0</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
@@ -17978,7 +18002,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1056">
+<o:Column Id="o1058">
 <a:ObjectID>D12DC8AD-CF58-4DE5-A9DC-ABB63D349D13</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
@@ -17990,7 +18014,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1057">
+<o:Column Id="o1059">
 <a:ObjectID>5BC7B1D6-E34E-4473-9DF1-CA6240B1C23F</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18003,7 +18027,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1058">
+<o:Key Id="o1060">
 <a:ObjectID>6EEDA542-1E85-47A3-BC57-7C65558D93D0</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18012,12 +18036,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557304098</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1052"/>
+<o:Column Ref="o1054"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1058"/>
+<o:Key Ref="o1060"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o255">
@@ -18031,7 +18055,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>出租房间图片</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1059">
+<o:Column Id="o1061">
 <a:ObjectID>98ED7313-E915-44A1-9D4F-80F5BC057C88</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18044,7 +18068,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1060">
+<o:Column Id="o1062">
 <a:ObjectID>C9DD2C07-B914-4F63-AFCD-05FA9EEC9184</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18056,7 +18080,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1061">
+<o:Column Id="o1063">
 <a:ObjectID>B557681C-3BC2-492A-9313-38454B3D480A</a:ObjectID>
 <a:Name>rental_house_id</a:Name>
 <a:Code>rental_house_id</a:Code>
@@ -18068,7 +18092,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1062">
+<o:Column Id="o1064">
 <a:ObjectID>7EFF853D-17E5-459D-8942-60286B8BF991</a:ObjectID>
 <a:Name>img_url</a:Name>
 <a:Code>img_url</a:Code>
@@ -18080,7 +18104,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1063">
+<o:Column Id="o1065">
 <a:ObjectID>986D1A7D-1053-4346-AD5C-D64AEE62DD3F</a:ObjectID>
 <a:Name>img_type</a:Name>
 <a:Code>img_type</a:Code>
@@ -18092,7 +18116,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1064">
+<o:Column Id="o1066">
 <a:ObjectID>A094BD2C-60B5-4AC9-A98E-176D07F29C66</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18105,7 +18129,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1065">
+<o:Key Id="o1067">
 <a:ObjectID>F8E42723-01EE-48CA-B9B4-9B70D9EE52C2</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18114,12 +18138,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557307564</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1059"/>
+<o:Column Ref="o1061"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1065"/>
+<o:Key Ref="o1067"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o256">
@@ -18133,7 +18157,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>用户车牌号表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1066">
+<o:Column Id="o1068">
 <a:ObjectID>2ADC4DD9-6B52-46D7-80A7-0B269251996F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18146,7 +18170,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1067">
+<o:Column Id="o1069">
 <a:ObjectID>B2476244-EFC3-4FF8-A728-50D1941D12BB</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18158,7 +18182,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1068">
+<o:Column Id="o1070">
 <a:ObjectID>D4FE9889-F81C-40A2-9777-99934795E873</a:ObjectID>
 <a:Name>ta_user_id</a:Name>
 <a:Code>ta_user_id</a:Code>
@@ -18170,7 +18194,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1069">
+<o:Column Id="o1071">
 <a:ObjectID>9AF156AE-3592-4A2F-ADD4-AF7D94A024F2</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
@@ -18182,7 +18206,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1070">
+<o:Column Id="o1072">
 <a:ObjectID>4AF2667F-B53D-4CAB-9DF9-7388FD52766D</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
@@ -18194,7 +18218,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1071">
+<o:Column Id="o1073">
 <a:ObjectID>33679CF5-35FC-4B38-9BFA-D008AFEB89C3</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
@@ -18205,7 +18229,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1072">
+<o:Column Id="o1074">
 <a:ObjectID>57CE5A0C-2BD4-4B1F-AED4-D8FFB7C53768</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
@@ -18217,7 +18241,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1073">
+<o:Column Id="o1075">
 <a:ObjectID>593C14C2-DC52-447D-9901-15585EB3D25E</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
@@ -18229,7 +18253,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1074">
+<o:Column Id="o1076">
 <a:ObjectID>B11B597D-C188-4F86-B983-1247AAC74386</a:ObjectID>
 <a:Name>renew_time</a:Name>
 <a:Code>renew_time</a:Code>
@@ -18241,7 +18265,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1075">
+<o:Column Id="o1077">
 <a:ObjectID>B9A4F75B-5600-4E03-97CA-F52659AF4566</a:ObjectID>
 <a:Name>license_type</a:Name>
 <a:Code>license_type</a:Code>
@@ -18253,7 +18277,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1076">
+<o:Column Id="o1078">
 <a:ObjectID>00FA4FFC-5A5F-4873-881A-EA8B4C2639BD</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18264,7 +18288,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1077">
+<o:Column Id="o1079">
 <a:ObjectID>C3559530-E9AA-4BB9-A794-582963C4A4BF</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -18276,7 +18300,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1078">
+<o:Column Id="o1080">
 <a:ObjectID>AD4AC6D5-678E-49FC-93B0-BB84F617CD00</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -18287,7 +18311,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1079">
+<o:Column Id="o1081">
 <a:ObjectID>85836F40-5F4D-4AB8-9DC7-2345ED8AE5DA</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -18301,7 +18325,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1080">
+<o:Key Id="o1082">
 <a:ObjectID>63206026-120F-43C3-AF49-7BF7198EAA64</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18310,12 +18334,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557367718</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1066"/>
+<o:Column Ref="o1068"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1080"/>
+<o:Key Ref="o1082"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o257">
@@ -18329,7 +18353,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>月租车缴费订单表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1081">
+<o:Column Id="o1083">
 <a:ObjectID>08F36182-AB22-433F-8F51-E805E2ACC919</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18342,7 +18366,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Identity>1</a:Identity>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1082">
+<o:Column Id="o1084">
 <a:ObjectID>45D65D52-E45F-466F-B13D-4BAB7431D881</a:ObjectID>
 <a:Name>community_id</a:Name>
 <a:Code>community_id</a:Code>
@@ -18354,7 +18378,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1083">
+<o:Column Id="o1085">
 <a:ObjectID>80318F85-BB20-4024-9998-D987A98B2C8F</a:ObjectID>
 <a:Name>user_license_id</a:Name>
 <a:Code>ta_user_id</a:Code>
@@ -18366,7 +18390,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1084">
+<o:Column Id="o1086">
 <a:ObjectID>63010136-6F76-4F2E-970D-D599445EE9B0</a:ObjectID>
 <a:Name>order_number</a:Name>
 <a:Code>order_number</a:Code>
@@ -18378,7 +18402,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1085">
+<o:Column Id="o1087">
 <a:ObjectID>D575E6DD-CE84-4ED5-8208-C3C936932B7B</a:ObjectID>
 <a:Name>order_status</a:Name>
 <a:Code>order_status</a:Code>
@@ -18390,7 +18414,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1086">
+<o:Column Id="o1088">
 <a:ObjectID>2D0B1C89-FCE7-43EB-9E46-3814A128EAA1</a:ObjectID>
 <a:Name>create_user</a:Name>
 <a:Code>create_user</a:Code>
@@ -18402,7 +18426,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1087">
+<o:Column Id="o1089">
 <a:ObjectID>A1476C8B-868D-4B30-ACD0-08C86C003A27</a:ObjectID>
 <a:Name>create_date</a:Name>
 <a:Code>create_date</a:Code>
@@ -18413,7 +18437,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1088">
+<o:Column Id="o1090">
 <a:ObjectID>BE3B494A-E8E4-421E-A871-FD700644271F</a:ObjectID>
 <a:Name>update_user</a:Name>
 <a:Code>update_user</a:Code>
@@ -18425,7 +18449,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1089">
+<o:Column Id="o1091">
 <a:ObjectID>A34F3B8C-7F9A-41ED-BD96-44A95D08C547</a:ObjectID>
 <a:Name>update_date</a:Name>
 <a:Code>update_date</a:Code>
@@ -18436,7 +18460,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>更新时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1090">
+<o:Column Id="o1092">
 <a:ObjectID>8EA7049C-94A1-453E-B283-8E79F440BCEB</a:ObjectID>
 <a:Name>extension_month</a:Name>
 <a:Code>extension_month</a:Code>
@@ -18448,7 +18472,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>
-<o:Column Id="o1091">
+<o:Column Id="o1093">
 <a:ObjectID>749D6A1D-5072-45E8-9826-22579FD72F1F</a:ObjectID>
 <a:Name>extension_price</a:Name>
 <a:Code>extension_price</a:Code>
@@ -18460,7 +18484,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1092">
+<o:Column Id="o1094">
 <a:ObjectID>E0395793-A050-4735-96E3-F17749B36CEC</a:ObjectID>
 <a:Name>payment_tel</a:Name>
 <a:Code>payment_tel</a:Code>
@@ -18472,7 +18496,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1093">
+<o:Column Id="o1095">
 <a:ObjectID>3D0DBFAF-ACCA-4178-AEC7-478CABDABE68</a:ObjectID>
 <a:Name>payment_name</a:Name>
 <a:Code>payment_name</a:Code>
@@ -18484,7 +18508,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1094">
+<o:Column Id="o1096">
 <a:ObjectID>2C17C691-0E31-4CD5-A8A7-5D326BB722F7</a:ObjectID>
 <a:Name>payment_type</a:Name>
 <a:Code>payment_type</a:Code>
@@ -18496,7 +18520,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(2)</a:DataType>
 <a:Length>2</a:Length>
 </o:Column>
-<o:Column Id="o1095">
+<o:Column Id="o1097">
 <a:ObjectID>431D00B1-22B7-4183-9E3C-8DC9222B68A9</a:ObjectID>
 <a:Name>expire_date</a:Name>
 <a:Code>expire_date</a:Code>
@@ -18507,7 +18531,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>到期时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o1096">
+<o:Column Id="o1098">
 <a:ObjectID>9D078A47-1407-4881-9BAC-287FC15BBEB6</a:ObjectID>
 <a:Name>unit_price</a:Name>
 <a:Code>unit_price</a:Code>
@@ -18519,7 +18543,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1097">
+<o:Column Id="o1099">
 <a:ObjectID>F78B78EC-E859-47C1-AC9D-A3E1B0CBA926</a:ObjectID>
 <a:Name>parking_lot</a:Name>
 <a:Code>parking_lot</a:Code>
@@ -18531,7 +18555,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1098">
+<o:Column Id="o1100">
 <a:ObjectID>9273BE9C-B9DC-4C92-AA4D-018829225523</a:ObjectID>
 <a:Name>license_plate</a:Name>
 <a:Code>license_plate</a:Code>
@@ -18545,7 +18569,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1099">
+<o:Key Id="o1101">
 <a:ObjectID>F57D4E18-1528-44BD-BEBB-4680F3D77BDA</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18554,12 +18578,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557372945</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1081"/>
+<o:Column Ref="o1083"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1099"/>
+<o:Key Ref="o1101"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o259">
@@ -18573,7 +18597,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Comment>app端版本号</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o1100">
+<o:Column Id="o1102">
 <a:ObjectID>A9874095-1A7A-41B3-BDAA-89FF219B226F</a:ObjectID>
 <a:Name>id</a:Name>
 <a:Code>id</a:Code>
@@ -18585,7 +18609,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>11</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o1101">
+<o:Column Id="o1103">
 <a:ObjectID>946CB4DD-6B85-465A-895E-5E8A8F2BA7C3</a:ObjectID>
 <a:Name>client_version</a:Name>
 <a:Code>client_version</a:Code>
@@ -18597,7 +18621,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1102">
+<o:Column Id="o1104">
 <a:ObjectID>BDFD3026-FC17-4D03-A503-7AF3A37592A5</a:ObjectID>
 <a:Name>service_version</a:Name>
 <a:Code>service_version</a:Code>
@@ -18609,7 +18633,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1103">
+<o:Column Id="o1105">
 <a:ObjectID>3D77C63D-552E-4815-8BBB-148013A10319</a:ObjectID>
 <a:Name>type</a:Name>
 <a:Code>type</a:Code>
@@ -18621,7 +18645,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o1104">
+<o:Column Id="o1106">
 <a:ObjectID>1414BD13-AA8D-4144-BA19-810AED96EE55</a:ObjectID>
 <a:Name>update_address</a:Name>
 <a:Code>update_address</a:Code>
@@ -18635,7 +18659,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o1105">
+<o:Key Id="o1107">
 <a:ObjectID>81BA3F75-E9E6-4FF0-BC41-4D8BAF735EDC</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -18644,17 +18668,17 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1557800616</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o1100"/>
+<o:Column Ref="o1102"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o1105"/>
+<o:Key Ref="o1107"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o1106">
+<o:Group Id="o1108">
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -19317,7 +19341,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o1107">
+<o:TargetModel Id="o1109">
 <a:ObjectID>B86EB932-C352-4174-86E4-2D2B1DDE4A45</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>