fuxingfan
/
smartCommunity
보기 1
좋아요 0
포크 0
코드 이슈 1 풀 리퀘스트 0 릴리즈 4 Activity
소스 검색

聚合接口 加上公寓 和pdm

傅行帆 6 년 전
부모
a1312b3311
커밋
e7141319ca
18개의 변경된 파일과 822개의 추가작업 그리고 350개의 파일을 삭제
분할 보기 변경상태 보기
  1. 14
    0
      CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AssembleController.java
  2. 2
    2
      CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpHotelServiceimpl.java
  3. 130
    1
      CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java
  4. 4
    0
      CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpShopController.java
  5. 12
    1
      CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRentalHouseMapper.java
  6. 68
    20
      CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpRentalHouse.java
  7. 18
    1
      CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpRentalHouseService.java
  8. 46
    1
      CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServiceImpl.java
  9. 38
    0
      CODE/smart-community/property-api/src/main/resources/mapper/TpRentalHouseMapper.xml
  10. 37
    0
      VUECODE/smart-property-manage/src/api/rental.js
  11. 1
    1
      VUECODE/smart-property-manage/src/router/index.js
  12. 4
    1
      VUECODE/smart-property-manage/src/store/index.js
  13. 52
    0
      VUECODE/smart-property-manage/src/store/modules/rental.js
  14. 95
    73
      VUECODE/smart-property-manage/src/views/rental/rentalAdd.vue
  15. 44
    46
      VUECODE/smart-property-manage/src/views/rental/rentalIndex.vue
  16. 8
    2
      VUECODE/smart-property-manage/src/views/shop/shopSettingEdit.vue
  17. 125
    101
      文档/MYSQL/smartCommunity.pdb
  18. 124
    100
      文档/MYSQL/smartCommunity.pdm

+ 14
- 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;
8 8 
 import com.community.huiju.service.BannerServiceI;
9 9 
 import com.community.huiju.service.MenuServiceI;
10 10 
 import com.community.huiju.service.MessageServiceI;
11 
+import com.community.huiju.service.TpHotelServicel;
12 
+import com.community.huiju.service.TpShopServicel;
11 13 
 import io.swagger.annotations.Api;
12 14 
 import io.swagger.annotations.ApiImplicitParam;
13 15 
 import io.swagger.annotations.ApiImplicitParams;
 
@@ -43,6 +45,12 @@ public class AssembleController extends BaseController {
43 45 
 	@Autowired
44 46 
 	private MessageServiceI messageService;
45 47
48 
+	@Autowired
49 
+	private TpHotelServicel tpHotelServicel;
50 
+
51 
+	@Autowired
52 
+	private TpShopServicel tpShopServicel;
53 
+
46 54 
 	@ApiOperation(value = "首页数据获取接口", notes = "首页数据获取接口")
47 55 
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
48 56 
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
 
@@ -64,11 +72,17 @@ public class AssembleController extends BaseController {
64 72 
 		List<ToBanner> toBannerList = bannerService.viewAllBannerImg(1);
65 73 
 		//获取消息总数接口
66 74 
 		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userElement.getUserVerifyId());
75 
+		//获取当前小区的酒店信息
76 
+		ResponseBean hotelRes = tpHotelServicel.getHotelCommunity(userElement);
77 
+		//获取当前小区的商铺信息
78 
+		ResponseBean shopRes = tpShopServicel.getShopCommunity(userElement);
67 79
68 80 
 		//组装数据
69 81 
 		indexMap.put("menuList",menuList);
70 82 
 		indexMap.put("bannerList",toBannerList);
71 83 
 		indexMap.put("messageTotal",totalMap.get("messageTotal"));
84 
+		indexMap.put("hotelMap",hotelRes.getData());
85 
+		indexMap.put("shopMap",shopRes.getData());
72 86 
 		indexMap.put("toDoTotal",totalMap.get("toDoTotal"));
73 87 
 		responseBean.addSuccess(indexMap);
74 88 
 		return responseBean;

+ 2
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpHotelServiceimpl.java 파일 보기 

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

+ 130
- 1
CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java 파일 보기 

@@ -1,10 +1,31 @@
1 1 
 package com.community.huiju.controller;
2 2
3 3
4 
+import com.alibaba.fastjson.JSONArray;
5 
+import com.alibaba.fastjson.JSONObject;
6 
+import com.community.commom.mode.ResponseBean;
7 
+import com.community.commom.session.UserElement;
4 8 
 import com.community.huiju.common.base.BaseController;
9 
+import com.community.huiju.model.TpRentalHouse;
10 
+import com.community.huiju.model.TpShop;
11 
+import com.community.huiju.service.ITpRentalHouseService;
12 
+import io.swagger.annotations.Api;
13 
+import io.swagger.annotations.ApiImplicitParam;
14 
+import io.swagger.annotations.ApiImplicitParams;
15 
+import io.swagger.annotations.ApiOperation;
16 
+import org.springframework.beans.factory.annotation.Autowired;
17 
+import org.springframework.cloud.context.config.annotation.RefreshScope;
18 
+import org.springframework.web.bind.annotation.RequestBody;
5 19 
 import org.springframework.web.bind.annotation.RequestMapping;
20 
+import org.springframework.web.bind.annotation.RequestMethod;
21 
+import org.springframework.web.bind.annotation.RequestParam;
6 22 
 import org.springframework.web.bind.annotation.RestController;
7 23
24 
+import javax.servlet.http.HttpSession;
25 
+import java.time.LocalDateTime;
26 
+import java.util.ArrayList;
27 
+import java.util.List;
28 
+
8 29 
 /**
9 30 
  * <p>
10 31 
  * 出租公寓表 前端控制器
 
@@ -15,6 +36,114 @@ import org.springframework.web.bind.annotation.RestController;
15 36 
  */
16 37 
 @RestController
17 38 
 @RequestMapping("/")
39 
+@RefreshScope
40 
+@Api(value = "长租公寓API", description = "长租公寓API")
18 41 
 public class TpRentalHouseController extends BaseController {
19 
-
42 
+
43 
+	@Autowired
44 
+	private ITpRentalHouseService tpRentalHouseService;
45 
+
46 
+	@ApiOperation(value = "根据搜索条件获取公寓列表", notes = "根据搜索条件获取公寓列表")
47 
+	@ApiImplicitParams({
48 
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "房间编号"),
49 
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseName", value = "房间名称"),
50 
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "startPrice", value = "开始价格"),
51 
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "endPrice", value = "结束价格"),
52 
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "rentalType", value = "租赁方式"),
53 
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseType", value = "户型"),
54 
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseStatus", value = "上架状态"),
55 
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
56 
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
57 
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
58 
+	})
59 
+	@RequestMapping(value = "/rentals",method = RequestMethod.GET)
60 
+	public ResponseBean getRentalList(@RequestParam(value = "id") Integer id,
61 
+	                                @RequestParam(value = "houseName") String houseName,
62 
+	                                @RequestParam(value = "startPrice") String startPrice,
63 
+	                                @RequestParam(value = "endPrice") String endPrice,
64 
+	                                @RequestParam(value = "rentalType") String rentalType,
65 
+	                                @RequestParam(value = "houseType") String houseType,
66 
+	                                @RequestParam(value = "houseStatus") String houseStatus,
67 
+	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
68 
+	                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
69 
+	                                HttpSession session) {
70 
+		ResponseBean responseBean = new ResponseBean();
71 
+		UserElement userElement = getUserElement(session);
72 
+		responseBean = tpRentalHouseService.getRentalList(id,houseName,startPrice,endPrice,rentalType,houseType,houseStatus,userElement,pageNum,pageSize);
73 
+		return responseBean;
74 
+	}
75 
+
76 
+	@ApiOperation(value = "添加公寓", notes = "添加公寓")
77 
+	@ApiImplicitParams({
78 
+			@ApiImplicitParam(paramType = "body", dataType = "TpRentalHouse", name = "rentalHouse", value = "公寓"),
79 
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
80 
+	})
81 
+	@RequestMapping(value = "/rental/add",method = RequestMethod.POST)
82 
+	public ResponseBean saveRental(@RequestBody TpRentalHouse rentalHouse, HttpSession session){
83 
+		ResponseBean responseBean = new ResponseBean();
84 
+		UserElement userElement = getUserElement(session);
85 
+		responseBean = tpRentalHouseService.saveRental(rentalHouse,userElement);
86 
+		return responseBean;
87 
+	}
88 
+
89 
+
90 
+	@ApiOperation(value = "上架房间", notes = "上架房间")
91 
+	@ApiImplicitParams({
92 
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "房间id集合"),
93 
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
94 
+	})
95 
+	@RequestMapping(value = "/rental/shelf",method = RequestMethod.POST)
96 
+	public ResponseBean shelfRental(@RequestBody String jsonString, HttpSession session){
97 
+		ResponseBean responseBean = new ResponseBean();
98 
+		UserElement userElement = getUserElement(session);
99 
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
100 
+		JSONArray ids = jsonObject.getJSONArray("idArray");
101 
+		List<TpRentalHouse> rentalList = new ArrayList<>();
102 
+		for (Object id : ids){
103 
+			TpRentalHouse rentalHouse = new TpRentalHouse();
104 
+			rentalHouse.setId((Integer) id);
105 
+			rentalHouse.setHouseStatus("1");
106 
+			rentalHouse.setUpdateUser(userElement.getId());
107 
+			rentalHouse.setUpdateDate(LocalDateTime.now());
108 
+			rentalList.add(rentalHouse);
109 
+		}
110 
+
111 
+		boolean state = tpRentalHouseService.updateBatchById(rentalList);
112 
+		if (state){
113 
+			responseBean.addSuccess("上架成功");
114 
+		}else{
115 
+			responseBean.addError("上架失败");
116 
+		}
117 
+		return responseBean;
118 
+	}
119 
+
120 
+	@ApiOperation(value = "下架房间", notes = "下架房间")
121 
+	@ApiImplicitParams({
122 
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "房间id集合"),
123 
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
124 
+	})
125 
+	@RequestMapping(value = "/rental/obtained",method = RequestMethod.POST)
126 
+	public ResponseBean obtainedRental(@RequestBody String jsonString, HttpSession session){
127 
+		ResponseBean responseBean = new ResponseBean();
128 
+		UserElement userElement = getUserElement(session);
129 
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
130 
+		JSONArray ids = jsonObject.getJSONArray("idArray");
131 
+		List<TpRentalHouse> rentalList = new ArrayList<>();
132 
+		for (Object id : ids){
133 
+			TpRentalHouse rentalHouse = new TpRentalHouse();
134 
+			rentalHouse.setId((Integer) id);
135 
+			rentalHouse.setHouseStatus("2");
136 
+			rentalHouse.setUpdateUser(userElement.getId());
137 
+			rentalHouse.setUpdateDate(LocalDateTime.now());
138 
+			rentalList.add(rentalHouse);
139 
+		}
140 
+
141 
+		boolean state = tpRentalHouseService.updateBatchById(rentalList);
142 
+		if (state){
143 
+			responseBean.addSuccess("下架成功");
144 
+		}else{
145 
+			responseBean.addError("下架失败");
146 
+		}
147 
+		return responseBean;
148 
+	}
20 149 
 }

+ 4
- 0
CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpShopController.java 파일 보기 

@@ -10,10 +10,12 @@ import com.community.huiju.model.TpShop;
10 10 
 import com.community.huiju.model.TpShopType;
11 11 
 import com.community.huiju.service.ITpShopService;
12 12 
 import com.netflix.ribbon.proxy.annotation.Http;
13 
+import io.swagger.annotations.Api;
13 14 
 import io.swagger.annotations.ApiImplicitParam;
14 15 
 import io.swagger.annotations.ApiImplicitParams;
15 16 
 import io.swagger.annotations.ApiOperation;
16 17 
 import org.springframework.beans.factory.annotation.Autowired;
18 
+import org.springframework.cloud.context.config.annotation.RefreshScope;
17 19 
 import org.springframework.web.bind.annotation.PathVariable;
18 20 
 import org.springframework.web.bind.annotation.RequestBody;
19 21 
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -36,6 +38,8 @@ import java.util.List;
36 38 
  */
37 39 
 @RestController
38 40 
 @RequestMapping("/")
41 
+@RefreshScope
42 
+@Api(value = "商铺API", description = "商铺API")
39 43 
 public class TpShopController extends BaseController {
40 44
41 45 
 	@Autowired

+ 12
- 1
CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRentalHouseMapper.java 파일 보기 

@@ -1,7 +1,11 @@
1 1 
 package com.community.huiju.dao;
2 2
3 3 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4 5 
 import com.community.huiju.model.TpRentalHouse;
6 
+import org.apache.ibatis.annotations.Param;
7 
+
8 
+import java.util.List;
5 9
6 10 
 /**
7 11 
  * <p>
 
@@ -12,5 +16,12 @@ import com.community.huiju.model.TpRentalHouse;
12 16 
  * @since 2019-05-13
13 17 
  */
14 18 
 public interface TpRentalHouseMapper extends BaseMapper<TpRentalHouse> {
15 
-
19 
+
20 
+	/**
21 
+	 * 获取公寓列表
22 
+	 * @param page
23 
+	 * @param tpRentalHouse
24 
+	 * @return
25 
+	 */
26 
+	List<TpRentalHouse> getRentalList(Page page, @Param("tpRentalHouse") TpRentalHouse tpRentalHouse);
16 27 
 }

+ 68
- 20
CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpRentalHouse.java 파일 보기 

@@ -1,6 +1,8 @@
1 1 
 package com.community.huiju.model;
2 2
3 
+import com.baomidou.mybatisplus.annotation.IdType;
3 4 
 import com.baomidou.mybatisplus.annotation.TableField;
5 
+import com.baomidou.mybatisplus.annotation.TableId;
4 6 
 import lombok.Data;
5 7 
 import lombok.EqualsAndHashCode;
6 8 
 import lombok.experimental.Accessors;
 
@@ -14,7 +16,7 @@ import java.time.LocalDateTime;
14 16 
  * </p>
15 17 
  *
16 18 
  * @author jobob
17 
- * @since 2019-05-13
19 
+ * @since 2019-05-14
18 20 
  */
19 21 
 @Data
20 22 
 @EqualsAndHashCode(callSuper = false)
 
@@ -22,6 +24,14 @@ import java.time.LocalDateTime;
22 24 
 public class TpRentalHouse implements Serializable {
23 25
24 26 
     private static final long serialVersionUID = 1L;
27 
+
28 
+    @TableId(value = "id", type = IdType.AUTO)
29 
+    private Integer id;
30 
+
31 
+    /**
32 
+     * 我们系统的小区ID
33 
+     */
34 
+    private Integer communityId;
25 35
26 36 
     /**
27 37 
      * 房间名称
 
@@ -98,45 +108,61 @@ public class TpRentalHouse implements Serializable {
98 108 
      */
99 109 
     private String bed;
100 110
111 
+    /**
112 
+     * 床垫 1 有
113 
+     */
114 
+    private String mattress;
115 
+
101 116 
     /**
102 117 
      * 衣柜 1 有
103 118 
      */
104 119 
     private String wardrobe;
105 120
106 121 
     /**
107 
-     * 餐桌 1 有
122 
+     * 沙发 1 有
108 123 
      */
109 
-    private String diningTable;
124 
+    private String sofa;
110 125
111 126 
     /**
112 
-     * 电脑桌 1 有
127 
+     *  洗衣机 1 有
113 128 
      */
114 
-    private String computerDesk;
129 
+    private String washingMachine;
115 130
116 131 
     /**
117 
-     * 热水器 1 有
132 
+     * 空调 1 有
118 133 
      */
119 
-    private String waterHeater;
134 
+    private String airConditioning;
120 135
121 136 
     /**
122 
-     * 椅子 1 有
137 
+     * 冰箱 1 有
123 138 
      */
124 
-    private String chair;
139 
+    private String fridge;
125 140
126 141 
     /**
127 
-     *  洗衣机 1 有
142 
+     * 电视 1有
128 143 
      */
129 
-    private String washingMachine;
144 
+    @TableField("TV")
145 
+    private String tv;
130 146
131 147 
     /**
132 
-     * 空调 1 有
148 
+     * 智能锁 1有
133 149 
      */
134 
-    private String airConditioning;
150 
+    private String smartLock;
151 
+
152 
+    /**
153 
+     * 热水器 1 有
154 
+     */
155 
+    private String waterHeater;
156 
+
157 
+    /**
158 
+     * 桌子 1 有
159 
+     */
160 
+    private String desk;
135 161
136 162 
     /**
137 
-     * 台灯 1 有
163 
+     * 椅子 1 有
138 164 
      */
139 
-    private String tableLamp;
165 
+    private String chair;
140 166
141 167 
     /**
142 168 
      * WiFi 1 有
 
@@ -145,14 +171,19 @@ public class TpRentalHouse implements Serializable {
145 171 
     private String WiFi;
146 172
147 173 
     /**
148 
-     * 微波炉 1 有
174 
+     * 厨房 1 有
149 175 
      */
150 
-    private String microwaveOven;
176 
+    private String kitchen;
151 177
152 178 
     /**
153 
-     * 天然气 1 有
179 
+     * 独卫 1 有
154 180 
      */
155 
-    private String naturalGas;
181 
+    private String bathroom;
182 
+
183 
+    /**
184 
+     * 阳台 1 有
185 
+     */
186 
+    private String balcony;
156 187
157 188 
     /**
158 189 
      * 创建时间
 
@@ -173,6 +204,23 @@ public class TpRentalHouse implements Serializable {
173 204 
      * 更新人
174 205 
      */
175 206 
     private Integer updateUser;
176 
-
207 
+
208 
+    /**
209 
+     * 开始价格
210 
+     */
211 
+    @TableField(exist = false)
212 
+    private String startPrice;
213 
+
214 
+    /**
215 
+     * 结束价格
216 
+     */
217 
+    @TableField(exist = false)
218 
+    private String endPrice;
219 
+
220 
+    /**
221 
+     * 更新人
222 
+     */
223 
+    @TableField(exist = false)
224 
+    private String userName;
177 225
178 226 
 }

+ 18
- 1
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpRentalHouseService.java 파일 보기 

@@ -1,6 +1,8 @@
1 1 
 package com.community.huiju.service;
2 2
3 3 
 import com.baomidou.mybatisplus.extension.service.IService;
4 
+import com.community.commom.mode.ResponseBean;
5 
+import com.community.commom.session.UserElement;
4 6 
 import com.community.huiju.model.TpRentalHouse;
5 7
6 8 
 /**
 
@@ -12,5 +14,20 @@ import com.community.huiju.model.TpRentalHouse;
12 14 
  * @since 2019-05-13
13 15 
  */
14 16 
 public interface ITpRentalHouseService extends IService<TpRentalHouse> {
15 
-
17 
+
18 
+	/**
19 
+	 * 获取公寓房间列表
20 
+	 * @param id
21 
+	 * @param houseName
22 
+	 * @param startPrice
23 
+	 * @param endPrice
24 
+	 * @param rentalType
25 
+	 * @param houseType
26 
+	 * @param houseStatus
27 
+	 * @param userElement
28 
+	 * @param pageNum
29 
+	 * @param pageSize
30 
+	 * @return
31 
+	 */
32 
+	ResponseBean getRentalList(Integer id, String houseName, String startPrice, String endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize);
16 33 
 }

+ 46
- 1
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServiceImpl.java 파일 보기 

@@ -1,11 +1,19 @@
1 1 
 package com.community.huiju.service.impl;
2 2
3 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 4 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 
+import com.community.commom.mode.ResponseBean;
6 
+import com.community.commom.session.UserElement;
4 7 
 import com.community.huiju.dao.TpRentalHouseMapper;
5 8 
 import com.community.huiju.model.TpRentalHouse;
6 9 
 import com.community.huiju.service.ITpRentalHouseService;
10 
+import org.springframework.beans.factory.annotation.Autowired;
7 11 
 import org.springframework.stereotype.Service;
8 12
13 
+import java.util.HashMap;
14 
+import java.util.List;
15 
+import java.util.Map;
16 
+
9 17 
 /**
10 18 
  * <p>
11 19 
  * 出租公寓表 服务实现类
 
@@ -16,5 +24,42 @@ import org.springframework.stereotype.Service;
16 24 
  */
17 25 
 @Service
18 26 
 public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, TpRentalHouse> implements ITpRentalHouseService {
19 
-
27 
+
28 
+	@Autowired
29 
+	private TpRentalHouseMapper tpRentalHouseMapper;
30 
+	/**
31 
+	 * 获取公寓房间列表
32 
+	 *
33 
+	 * @param id
34 
+	 * @param houseName
35 
+	 * @param startPrice
36 
+	 * @param endPrice
37 
+	 * @param rentalType
38 
+	 * @param houseType
39 
+	 * @param houseStatus
40 
+	 * @param userElement
41 
+	 * @param pageNum
42 
+	 * @param pageSize
43 
+	 * @return
44 
+	 */
45 
+	@Override
46 
+	public ResponseBean getRentalList(Integer id, String houseName, String startPrice, String endPrice, String rentalType, String houseType, String houseStatus, UserElement userElement, Integer pageNum, Integer pageSize) {
47 
+		ResponseBean responseBean = new ResponseBean();
48 
+		Page page = new Page(pageNum,pageSize);
49 
+		TpRentalHouse tpRentalHouse = new TpRentalHouse();
50 
+		tpRentalHouse.setId(id);
51 
+		tpRentalHouse.setHouseName(houseName);
52 
+		tpRentalHouse.setRentalType(rentalType);
53 
+		tpRentalHouse.setHouseType(houseType);
54 
+		tpRentalHouse.setHouseStatus(houseStatus);
55 
+		tpRentalHouse.setCommunityId(userElement.getCommunityId());
56 
+		tpRentalHouse.setStartPrice(startPrice);
57 
+		tpRentalHouse.setEndPrice(endPrice);
58 
+		List<TpRentalHouse> list = tpRentalHouseMapper.getRentalList(page,tpRentalHouse);
59 
+		Map<String,Object> map = new HashMap<>();
60 
+		map.put("list", list);
61 
+		map.put("total", page.getTotal());
62 
+		responseBean.addSuccess(map);
63 
+		return responseBean;
64 
+	}
20 65 
 }

+ 38
- 0
CODE/smart-community/property-api/src/main/resources/mapper/TpRentalHouseMapper.xml 파일 보기 

@@ -2,4 +2,42 @@
2 2 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 
 <mapper namespace="com.community.huiju.dao.TpRentalHouseMapper">
4 4
5 
+    <select id="getRentalList" resultType="com.community.huiju.model.TpRentalHouse">
6 
+        SELECT
7 
+            t.id,
8 
+            t.house_name,
9 
+            t.rental_price,
10 
+            t.rental_type,
11 
+            t.house_type,
12 
+            t.house_status,
13 
+            t.sort,
14 
+            t.update_date,
15 
+            u.user_name
16 
+        FROM
17 
+            tp_rental_house t
18 
+        LEFT JOIN tp_user u ON t.update_user = u.id
19 
+        where 1=1
20 
+        and t.community_id = #{tpRentalHouse.communityId}
21 
+        <if test="tpRentalHouse.id != null and tpRentalHouse.id != ''">
22 
+            and t.id like concat('%',#{tpRentalHouse.id},'%')
23 
+        </if>
24 
+        <if test="tpRentalHouse.houseName != null and tpRentalHouse.houseName != ''">
25 
+            and t.house_name like concat('%',#{tpRentalHouse.houseName},'%')
26 
+        </if>
27 
+        <if test="tpRentalHouse.rentalType != null and tpRentalHouse.rentalType != ''">
28 
+            and t.rental_type  = #{tpRentalHouse.rentalType}
29 
+        </if>
30 
+        <if test="tpRentalHouse.houseType != null and tpRentalHouse.houseType != ''">
31 
+            and t.house_type  = #{tpRentalHouse.houseType}
32 
+        </if>
33 
+        <if test="tpRentalHouse.houseStatus != null and tpRentalHouse.houseStatus != ''">
34 
+            and t.house_status  = #{tpRentalHouse.houseStatus}
35 
+        </if>
36 
+        <if test="tpRentalHouse.startPrice != null and tpRentalHouse.startPrice != ''">
37 
+            and t.rental_price  >= #{tpRentalHouse.startPrice}
38 
+        </if>
39 
+        <if test="tpRentalHouse.endPrice != null and tpRentalHouse.endPrice != ''">
40 
+            and t.rental_price  &lt;= #{tpRentalHouse.endPrice}
41 
+        </if>
42 
+    </select>
5 43 
 </mapper>

+ 37
- 0
VUECODE/smart-property-manage/src/api/rental.js 파일 보기 

@@ -0,0 +1,37 @@
1 
+import request from '@/utils/request'
2 
+
3 
+export function fetchRentalList(query) {
4 
+  return request({
5 
+    url: '/rentals',
6 
+    method: 'get',
7 
+    params: query
8 
+  })
9 
+}
10 
+
11 
+export function obtainedRental(ids) {
12 
+  return request({
13 
+    url: '/rental/obtained',
14 
+    method: 'post',
15 
+    data: {
16 
+      idArray: ids
17 
+    }
18 
+  })
19 
+}
20 
+
21 
+export function shelfRental(ids) {
22 
+  return request({
23 
+    url: '/rental/shelf',
24 
+    method: 'post',
25 
+    data: {
26 
+      idArray: ids
27 
+    }
28 
+  })
29 
+}
30 
+
31 
+export function addShop(listQuery) {
32 
+  return request({
33 
+    url: '/rental/add',
34 
+    method: 'post',
35 
+    data: listQuery
36 
+  })
37 
+}

+ 1
- 1
VUECODE/smart-property-manage/src/router/index.js 파일 보기 

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

+ 4
- 1
VUECODE/smart-property-manage/src/store/index.js 파일 보기 

@@ -24,6 +24,8 @@ import equipment from './modules/equipment'
24 24 
 import shopType from './modules/shopType'
25 25 
 import grogshop from './modules/grogshop'
26 26 
 import license from './modules/license'
27 
+import rental from './modules/rental'
28 
+
27 29 
 Vue.use(Vuex)
28 30
29 31 
 const store = new Vuex.Store({
 
@@ -50,7 +52,8 @@ const store = new Vuex.Store({
50 52 
     equipment,
51 53 
     shopType,
52 54 
     grogshop,
53 
-    license
55 
+    license,
56 
+    rental
54 57 
   },
55 58 
   getters
56 59 
 })

+ 52
- 0
VUECODE/smart-property-manage/src/store/modules/rental.js 파일 보기 

@@ -0,0 +1,52 @@
1 
+import { fetchRentalList, shelfRental, obtainedRental, addRental } from '@/api/rental'
2 
+
3 
+const transaction = {
4 
+  namespaced: true,
5 
+  state: {
6 
+  },
7 
+
8 
+  mutations: {
9 
+  },
10 
+
11 
+  actions: {
12 
+    // 获取收费组列表
13 
+    FetchRentalList({ commit }, listQuery) {
14 
+      return new Promise((resolve, reject) => {
15 
+        fetchRentalList(listQuery).then(response => {
16 
+          resolve(response)
17 
+        }).catch(error => {
18 
+          reject(error)
19 
+        })
20 
+      })
21 
+    },
22 
+    AddRental({ commit }, listQuery) {
23 
+      return new Promise((resolve, reject) => {
24 
+        addRental(listQuery).then(response => {
25 
+          resolve(response)
26 
+        }).catch(error => {
27 
+          reject(error)
28 
+        })
29 
+      })
30 
+    },
31 
+    ShelfRental({ commit }, ids) {
32 
+      return new Promise((resolve, reject) => {
33 
+        shelfRental(ids).then(response => {
34 
+          resolve(response)
35 
+        }).catch(error => {
36 
+          reject(error)
37 
+        })
38 
+      })
39 
+    },
40 
+    ObtainedRental({ commit }, ids) {
41 
+      return new Promise((resolve, reject) => {
42 
+        obtainedRental(ids).then(response => {
43 
+          resolve(response)
44 
+        }).catch(error => {
45 
+          reject(error)
46 
+        })
47 
+      })
48 
+    }
49 
+  }
50 
+}
51 
+
52 
+export default transaction

+ 95
- 73
VUECODE/smart-property-manage/src/views/rental/rentalAdd.vue 파일 보기 

@@ -1,23 +1,14 @@
1 1 
 <template>
2 2 
   <div class="root">
3 3 
     <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
4 
-      <el-form-item label="商铺名称" prop="shopName">
5 
-        <el-input v-model="listData.shopName"/>
4 
+      <el-form-item label="房间名称" prop="houseName">
5 
+        <el-input v-model="listData.houseName"/>
6 6 
       </el-form-item>
7 
-      <el-form-item label="商铺说明" prop="remark">
8 
-        <el-input v-model="listData.remark"/>
7 
+      <el-form-item label="房间租金" prop="rentalPrice">
8 
+        <el-input v-model="listData.rentalPrice"/>
9 9 
       </el-form-item>
10 
-      <el-form-item label="app首页展示图" prop="appIndexImg">
11 
-        <el-upload
12 
-          class="avatar-uploader"
13 
-          name="uploadFiles"
14 
-          :action="uploadImgUrl"
15 
-          :show-file-list="false"
16 
-          :on-success="handleAppIndexSuccess"
17 
-          :before-upload="beforeAvatarUpload">
18 
-          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
19 
-          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
20 
-        </el-upload>
10 
+      <el-form-item label="面积" prop="area">
11 
+        <el-input v-model="listData.area"/>
21 12 
       </el-form-item>
22 13 
       <el-form-item label="app列表展示图" prop="appListImg">
23 14 
         <el-upload
 
@@ -31,7 +22,21 @@
31 22 
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
32 23 
         </el-upload>
33 24 
       </el-form-item>
34 
-      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
25 
+      <el-form-item label="户型" prop="houseType">
26 
+        <el-select v-model="listData.houseType" placeholder="请选择">
27 
+            <el-option label="一室居" value="1"/>
28 
+            <el-option label="二室居" value="2"/>
29 
+            <el-option label="三室居" value="3"/>
30 
+            <el-option label="四室居及以上" value="4"/>
31 
+          </el-select>
32 
+      </el-form-item>
33 
+      <el-form-item label="租赁方式" prop="rentalType">
34 
+        <el-select v-model="listData.rentalType" placeholder="请选择">
35 
+            <el-option label="整租" value="1"/>
36 
+            <el-option label="合租" value="2"/>
37 
+          </el-select>
38 
+      </el-form-item>
39 
+      <el-form-item label="轮播图" prop="appCarouselImg">
35 40 
         <el-upload
36 41 
           name="uploadFiles"
37 42 
           :limit="6"
 
@@ -46,32 +51,48 @@
46 51 
           <img width="100%" :src="dialogImageUrl" alt="">
47 52 
         </el-dialog>
48 53 
       </el-form-item>
49 
-      <el-form-item label="权重" prop="sort">
50 
-        <el-input v-model="listData.sort"/>
51 
-      </el-form-item>
52 
-      <el-form-item label="商铺类型" prop="shopTypeId">
53 
-        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
54 
-          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
55 
-        </el-select>
56 
-      </el-form-item>
57 
-      <el-form-item label="上架状态" prop="shopStatus">
54 
+      <el-form-item label="上架状态" prop="houseStatus">
58 55 
         <el-select v-model="listData.shopStatus" placeholder="请选择">
59 56 
           <el-option label="已上架" value="1"/>
60 57 
           <el-option label="已下架" value="2"/>
61 58 
         </el-select>
62 59 
       </el-form-item>
63 
-      <el-form-item label="联系电话" prop="shopTel">
64 
-        <el-input v-model="listData.shopTel"/>
60 
+      <el-form-item label="楼层" prop="houseLevel">
61 
+         <el-input v-model="listData.houseLevel"/>
62 
+      </el-form-item>
63 
+      <el-form-item label="特色标签" prop="houseLabel">
64 
+        <el-input v-model="listData.houseLabel"/>
65 
+      </el-form-item>
66 
+      <el-form-item label="权重" prop="sort">
67 
+        <el-input v-model="listData.sort"/>
68 
+      </el-form-item>
69 
+      <el-form-item label="联系电话" prop="houseTel">
70 
+        <el-input v-model="listData.houseTel"/>
65 71 
       </el-form-item>
66 
-      <el-form-item label="商铺地址" prop="shopAddress">
67 
-        <el-input v-model="listData.shopAddress"/>
72 
+      <el-form-item label="小区地址" prop="communityAddress">
73 
+        <el-input v-model="listData.communityAddress"/>
68 74 
       </el-form-item>
69 
-      <el-form-item label="人均消费" prop="averagePrice">
70 
-        <el-input v-model="listData.averagePrice"/>
75 
+      <el-form-item label="房屋配套">
76 
+        <el-checkbox v-model="listData.bed">床</el-checkbox>
77 
+        <el-checkbox v-model="listData.mattress">床垫</el-checkbox>
78 
+        <el-checkbox v-model="listData.wardrobe">衣柜</el-checkbox>
79 
+        <el-checkbox v-model="listData.sofa">沙发</el-checkbox>
80 
+        <el-checkbox v-model="listData.washingMachine">洗衣机</el-checkbox>
81 
+        <el-checkbox v-model="listData.airConditioning">空调</el-checkbox>
82 
+        <el-checkbox v-model="listData.fridge">冰箱</el-checkbox>
83 
+        <el-checkbox v-model="listData.TV">电视</el-checkbox>
84 
+        <el-checkbox v-model="listData.smartLock">智能锁</el-checkbox>
85 
+        <el-checkbox v-model="listData.waterHeater">热水器</el-checkbox>
86 
+        <el-checkbox v-model="listData.desk">桌子</el-checkbox>
87 
+        <el-checkbox v-model="listData.chair">椅子</el-checkbox>
88 
+        <el-checkbox v-model="listData.WiFi">网络</el-checkbox>
89 
+        <el-checkbox v-model="listData.kitchen">厨房</el-checkbox>
90 
+        <el-checkbox v-model="listData.bathroom">独卫</el-checkbox>
91 
+        <el-checkbox v-model="listData.balcony">阳台</el-checkbox>
71 92 
       </el-form-item>
72 93 
       <el-form-item label="高德坐标">
73 
-        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
74 
-        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
94 
+        <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
95 
+        <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
75 96 
       </el-form-item>
76 97 
       <el-form-item label="">
77 98 
          <!-- 地图 -->
 
@@ -82,7 +103,7 @@
82 103 
           </el-amap>
83 104 
         </div>
84 105 
       </el-form-item>
85 
-      <el-form-item label="商铺介绍">
106 
+      <el-form-item label="房间介绍">
86 107 
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
87 108 
           <div id="father">
88 109 
             <wangeditor @wangeditorEvent="wangeditorValue"/>
 
@@ -107,25 +128,43 @@ export default {
107 128 
       events: {
108 129 
         click: e => {
109 130 
           // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
110 
-          this.listData.shopLongitude = e.lnglat.lng
111 
-          this.listData.shopLatitude = e.lnglat.lat
131 
+          this.listData.communityLongitude = e.lnglat.lng
132 
+          this.listData.communityLatitude = e.lnglat.lat
112 133 
         }
113 134 
       },
114 135 
       listData: {
115 
-        shopName: '',
116 
-        remark: '',
117 
-        appIndexImg: '',
136 
+        houseName: '',
137 
+        rentalPrice: '',
138 
+        area: '',
118 139 
         appListImg: '',
119 140 
         appCarouselImg: [],
141 
+        houseType: '',
142 
+        rentalType: '',
143 
+        houseStatus: '',
144 
+        houseLevel: '',
145 
+        houseLabel: '',
120 146 
         sort: '',
121 
-        shopTypeId: '',
122 
-        shopStatus: '',
123 
-        shopTel: '',
124 
-        shopAddress: '',
125 
-        averagePrice: '',
126 
-        shopLongitude: '',
127 
-        shopLatitude: '',
128 
-        shopIntroduction: ''
147 
+        houseTel: '',
148 
+        communityAddress: '',
149 
+        communityLongitude: '',
150 
+        communityLatitude: '',
151 
+        houseIntroduction: '',
152 
+        bed: '',
153 
+        mattress: '',
154 
+        wardrobe: '',
155 
+        sofa: '',
156 
+        washingMachine: '',
157 
+        airConditioning: '',
158 
+        fridge: '',
159 
+        TV: '',
160 
+        smartLock: '',
161 
+        waterHeater: '',
162 
+        desk: '',
163 
+        chair: '',
164 
+        WiFi: '',
165 
+        kitchen: '',
166 
+        bathroom: '',
167 
+        balcony: ''
129 168 
       },
130 169 
       dialogImageUrl: '',
131 170 
       dialogVisible: false,
 
@@ -139,32 +178,22 @@ export default {
139 178 
       mapCenter: [118.789509, 32.019989],
140 179 
       tableKey: 0,
141 180 
       rules: {
142 
-        typeName: [
143 
-          { required: true, message: '请输入商铺名称', trigger: 'blur' }
181 
+        houseName: [
182 
+          { required: true, message: '请输入房间名称', trigger: 'blur' }
144 183 
         ],
145 
-        remark: [
146 
-          { required: true, message: '请输入商铺说明', trigger: 'blur' }
147 
-        ],
148 
-        shopTel: [
184 
+        houseTel: [
149 185 
           { required: true, message: '请输入联系电话', trigger: 'blur' }
150 186 
         ],
151 
-        shopAddress: [
152 
-          { required: true, message: '请输入商铺地址', trigger: 'blur' }
153 
-        ],
154 
-        appIndexImg: [
155 
-          { required: true, message: 'app首页展示图', trigger: 'blur' }
156 
-        ],
157 187 
         appListImg: [
158 188 
           { required: true, message: 'app列表展示图', trigger: 'blur' }
159 189 
         ],
160 190 
         appCarouselImg: [
161 
-          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
191 
+          { required: true, message: '轮播图', trigger: 'blur' }
162 192 
         ],
163 193 
       }
164 194 
     }
165 195 
   },
166 196 
   mounted() {
167 
-    this.getShopTypeList()
168 197 
   },
169 198 
   methods: {
170 199 
      addMarker() {
 
@@ -194,13 +223,6 @@ export default {
194 223 
       this.dialogImageUrl = file.url;
195 224 
       this.dialogVisible = true;
196 225 
     },
197 
-    getShopTypeList() {
198 
-      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
199 
-        this.shopTypeList = res.data
200 
-      }).catch(() => {
201 
-        console.log('error ListAnnouncement')
202 
-      })
203 
-    },
204 226 
     onSearchResult(pois) {
205 227 
       // 搜索地图
206 228 
       let latSum = 0
 
@@ -220,12 +242,12 @@ export default {
220 242 
       }
221 243 
     },
222 244 
     wangeditorValue(value) {
223 
-      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
245 
+      this.listData.houseIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
224 246 
     },
225 247 
     submitForm(formName) { // 提交
226 248 
       this.$refs[formName].validate((valid) => {
227 249 
         if (valid) {
228 
-          this.addShop()
250 
+          this.addRental()
229 251 
         } else {
230 252 
           console.log('error submit!!')
231 253 
           return false
 
@@ -241,7 +263,7 @@ export default {
241 263 
       console.log(this.isRegistered)
242 264 
       this.$refs[formName].resetFields()
243 265 
     },
244 
-    addShop() {
266 
+    addRental() {
245 267 
       // 加载框
246 268 
       const loading = this.$loading({
247 269 
         lock: true,
 
@@ -249,13 +271,13 @@ export default {
249 271 
         spinner: 'el-icon-loading',
250 272 
         background: 'rgba(0, 0, 0, 0.7)'
251 273 
       })
252 
-      this.$store.dispatch('shopType/AddShop', this.listData).then((res) => {
274 
+      this.$store.dispatch('rental/AddRental', this.listData).then((res) => {
253 275 
         if (res.code === '0') {
254 276 
           this.$message({
255 277 
             message: res.message,
256 278 
             type: 'success'
257 279 
           })
258 
-          this.$router.push({ name: 'shop-index' })
280 
+          this.$router.push({ name: 'rental-index' })
259 281 
           loading.close()
260 282 
           return
261 283 
         }

+ 44
- 46
VUECODE/smart-property-manage/src/views/rental/rentalIndex.vue 파일 보기 

@@ -6,22 +6,22 @@
6 6 
         <el-input v-model.trim="listQuery.id" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="房间编号" />
7 7 
       </el-form-item>
8 8 
       <el-form-item class="filter-item" label="房间名称" >
9 
-        <el-input v-model.trim="listQuery.shopName" placeholder="房间名称" />
9 
+        <el-input v-model.trim="listQuery.houseName" placeholder="房间名称" />
10 10 
       </el-form-item>
11 11 
       <el-form-item class="filter-item" label="租金从" >
12 
-        <el-input v-model.trim="listQuery.shopName" placeholder="租金从" />
12 
+        <el-input v-model.trim="listQuery.startPrice" placeholder="租金从" />
13 13 
       </el-form-item>
14 14 
       <el-form-item class="filter-item" label="到" >
15 
-        <el-input v-model.trim="listQuery.shopName" placeholder="到" />
15 
+        <el-input v-model.trim="listQuery.endPrice" placeholder="到" />
16 16 
       </el-form-item>
17 17 
       <el-form-item class="filter-item" label="租赁方式" >
18 
-        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
18 
+        <el-select v-model="listQuery.rentalType" placeholder="请选择">
19 19 
             <el-option label="整租" value="1"/>
20 20 
             <el-option label="合租" value="2"/>
21 21 
           </el-select>
22 22 
       </el-form-item>
23 23 
       <el-form-item class="filter-item" label="户型" >
24 
-        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
24 
+        <el-select v-model="listQuery.houseType" placeholder="请选择">
25 25 
             <el-option label="一室居" value="1"/>
26 26 
             <el-option label="二室居" value="2"/>
27 27 
             <el-option label="三室居" value="3"/>
 
@@ -29,7 +29,7 @@
29 29 
           </el-select>
30 30 
       </el-form-item>
31 31 
       <el-form-item class="filter-item" label="上架状态" >
32 
-        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
32 
+        <el-select v-model="listQuery.houseStatus" placeholder="请选择">
33 33 
             <el-option label="已上架" value="1"/>
34 34 
             <el-option label="已下架" value="2"/>
35 35 
           </el-select>
 
@@ -42,8 +42,8 @@
42 42 
     <div class="button">
43 43 
       <el-button type="primary" @click="add">添加</el-button>
44 44 
       <el-button type="warning" @click="edit">修改</el-button>
45 
-      <el-button type="danger" @click="shelfShop">上架房间</el-button>
46 
-      <el-button type="danger" @click="obtainedShop">下架房间</el-button>
45 
+      <el-button type="danger" @click="shelfRental">上架房间</el-button>
46 
+      <el-button type="danger" @click="obtainedRental">下架房间</el-button>
47 47 
     </div>
48 48 
     <el-table
49 49 
       v-loading="listLoading"
 
@@ -57,29 +57,29 @@
57 57 
         type="selection"
58 58 
         width="55"/>
59 59 
       <el-table-column prop="id" label="房间编号" align="center"/>
60 
-      <el-table-column prop="shopName" label="房间名称" align="center" >
61 
-        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.shopName }}</span></a></template>
60 
+      <el-table-column prop="houseName" label="房间名称" align="center" >
61 
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.houseName }}</span></a></template>
62 62 
       </el-table-column>
63 63 
       <el-table-column prop="sort" label="权重" align="center"/>
64 
-      <el-table-column prop="typeName" label="租金" align="center"/>
65 
-      <el-table-column prop="shopStatus" label="上架状态" align="center">\
64 
+      <el-table-column prop="rentalPrice" label="租金" align="center"/>
65 
+      <el-table-column prop="houseStatus" label="上架状态" align="center">\
66 66 
         <template slot-scope="scope">
67 
-          <span v-if="scope.row.shopStatus === '1'">已上架</span>
68 
-          <span v-if="scope.row.shopStatus === '2'">已下架</span>
67 
+          <span v-if="scope.row.houseStatus === '1'">已上架</span>
68 
+          <span v-if="scope.row.houseStatus === '2'">已下架</span>
69 69 
         </template>
70 70 
       </el-table-column>
71 
-      <el-table-column prop="shopStatus" label="租赁方式" align="center">\
71 
+      <el-table-column prop="rentalType" label="租赁方式" align="center">\
72 72 
         <template slot-scope="scope">
73 
-          <span v-if="scope.row.shopStatus === '1'">整租</span>
74 
-          <span v-if="scope.row.shopStatus === '2'">合租</span>
73 
+          <span v-if="scope.row.rentalType === '1'">整租</span>
74 
+          <span v-if="scope.row.rentalType === '2'">合租</span>
75 75 
         </template>
76 76 
       </el-table-column>
77 
-      <el-table-column prop="shopStatus" label="户型" align="center">\
77 
+      <el-table-column prop="houseType" label="户型" align="center">\
78 78 
         <template slot-scope="scope">
79 
-          <span v-if="scope.row.shopStatus === '1'">一室居</span>
80 
-          <span v-if="scope.row.shopStatus === '2'">二室居</span>
81 
-          <span v-if="scope.row.shopStatus === '3'">三室居</span>
82 
-          <span v-if="scope.row.shopStatus === '4'">四室居及以上</span>
79 
+          <span v-if="scope.row.houseType === '1'">一室居</span>
80 
+          <span v-if="scope.row.houseType === '2'">二室居</span>
81 
+          <span v-if="scope.row.houseType === '3'">三室居</span>
82 
+          <span v-if="scope.row.houseType === '4'">四室居及以上</span>
83 83 
         </template>
84 84 
       </el-table-column>
85 85 
       <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 {
106 106 
     return {
107 107 
       listQuery: {
108 108 
         id: '',
109 
-        shopName: '',
110 
-        shopTypeId: '',
111 
-        shopStatus: '',
109 
+        houseName: '',
110 
+        startPrice: '',
111 
+        endPrice: '',
112 
+        rentalType: '',
113 
+        houseType: '',
114 
+        houseStatus: '',
112 115 
         pageNum: 1,
113 116 
         pageSize: 10
114 117 
       },
115 118 
       total: 0, // 数据总数
116 
-      shopList: [],
119 
+      rentalList: [],
117 120 
       shopTypeList: [],
118 121 
       deleteIds: [], // 选择的id集合
119 122 
       listLoading: true // 加载圈
 
@@ -122,11 +125,10 @@ export default {
122 125 
   mounted() {
123 126 
     // 获取数据
124 127 
     this.dataQuery()
125 
-    this.getShopTypeList()
126 128 
   },
127 129 
   methods: {
128 
-    ...mapActions('shopType', [
129 
-      'FetchShopList',
130 
+    ...mapActions('rental', [
131 
+      'FetchRentalList',
130 132 
       'FetchShopTypeSelect'
131 133 
     ]),
132 134 
     handleSizeChange(val) {
 
@@ -168,7 +170,7 @@ export default {
168 170 
     },
169 171 
     dataQuery() { // 查询数据
170 172 
       this.listLoading = true
171 
-      this.$store.dispatch('shopType/FetchShopList', this.listQuery).then((res) => {
173 
+      this.$store.dispatch('rental/FetchRentalList', this.listQuery).then((res) => {
172 174 
         const resData = res.data
173 175 
         this.rentalList = resData.list
174 176 
         this.total = resData.total
 
@@ -178,13 +180,6 @@ export default {
178 180 
         console.log('error ListAnnouncement')
179 181 
       })
180 182 
     },
181 
-    getShopTypeList() {
182 
-      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listQuery).then((res) => {
183 
-        this.shopTypeList = res.data
184 
-      }).catch(() => {
185 
-        console.log('error ListAnnouncement')
186 
-      })
187 
-    },
188 183 
     handleSelectionChange(data) {
189 184 
       // 设置为 空
190 185 
       this.deleteIds = []
 
@@ -200,14 +195,17 @@ export default {
200 195 
       this.listQuery.pageNum = 1
201 196 
       this.listQuery.pageSize = 10
202 197 
       this.listQuery.id =''
203 
-      this.listQuery.shopName=''
204 
-      this.listQuery.shopTypeId=''
205 
-      this.listQuery.shopStatus=''
198 
+      this.listQuery.houseName = '',
199 
+      this.listQuery.startPrice = '',
200 
+      this.listQuery.endPrice = '',
201 
+      this.listQuery.rentalType = '',
202 
+      this.listQuery.houseType = '',
203 
+      this.listQuery.houseStatus = '',
206 204 
       this.dataQuery()
207 205 
     },
208 206 
     // 添加公告
209 207 
     add() {
210 
-      this.$router.push({ name: 'shop-add' })
208 
+      this.$router.push({ name: 'rental-add' })
211 209 
     },
212 210 
     edit(){// 编辑公告
213 211 
       const ids = this.deleteIds
 
@@ -221,7 +219,7 @@ export default {
221 219 
       }
222 220 
        let ide= this.deleteIds[0]
223 221 
        this.listQuery.id = ide
224 
-       this.$router.push({ name: 'shop-edit', query: { id: ide }})
222 
+       this.$router.push({ name: 'rental-edit', query: { id: ide }})
225 223 
       },
226 224 
     deleteAnnouncement(){
227 225 
        let ide= this.deleteIds[0]
 
@@ -239,14 +237,14 @@ export default {
239 237 
         this.deleteId()
240 238 
       })
241 239 
     },
242 
-    shelfShop() {
240 
+    shelfRental() {
243 241 
       this.listLoading = true
244 242 
       const ids = this.deleteIds
245 243 
       if (ids < 1) {
246 244 
         this.$message.error('请至少选择一行数据上架!')
247 245 
         return
248 246 
       }
249 
-      this.$store.dispatch('shopType/ShelfShop', ids).then((res) => {
247 
+      this.$store.dispatch('rental/ShelfRental', ids).then((res) => {
250 248 
         this.listLoading = false
251 249 
         this.dataQuery()
252 250 
       }).catch(() => {
 
@@ -254,14 +252,14 @@ export default {
254 252 
         console.log('error DeleteAnnouncement')
255 253 
       })
256 254 
     },
257 
-    obtainedShop() {
255 
+    obtainedRental() {
258 256 
       this.listLoading = true
259 257 
       const ids = this.deleteIds
260 258 
       if (ids < 1) {
261 259 
         this.$message.error('请至少选择一行数据下架!')
262 260 
         return
263 261 
       }
264 
-      this.$store.dispatch('shopType/ObtainedShop', ids).then((res) => {
262 
+      this.$store.dispatch('rental/ObtainedRental', ids).then((res) => {
265 263 
         this.listLoading = false
266 264 
         this.dataQuery()
267 265 
       }).catch(() => {

+ 8
- 2
VUECODE/smart-property-manage/src/views/shop/shopSettingEdit.vue 파일 보기 

@@ -5,7 +5,7 @@
5 5 
         <el-input v-model="listQuery.typeName" style="width: 200px;"/>
6 6 
       </el-form-item>
7 7 
       <el-form-item label="权重" prop="sort">
8 
-        <el-input v-model="listQuery.sort" style="width: 200px;"/>
8 
+        <el-input v-model="listQuery.sort" :disabled="listQuery.isSys" style="width: 200px;"/>
9 9 
       </el-form-item>
10 10 
       <el-form-item>
11 11 
         <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
 
@@ -21,7 +21,8 @@ export default {
21 21 
       listQuery: {
22 22 
         id: '',
23 23 
         typeName: '',
24 
-        sort: ''
24 
+        sort: '',
25 
+        isSys: false
25 26 
       },
26 27 
       rules: {
27 28 
         typeName: [
 
@@ -60,6 +61,11 @@ export default {
60 61 
         const typeData = res.data
61 62 
         this.listQuery.typeName = typeData.typeName
62 63 
         this.listQuery.sort = typeData.sort
64 
+        let state = false
65 
+        if(typeData.source === "sys"){
66 
+          state = true
67 
+        }
68 
+        this.listQuery.isSys = state
63 69 
       })
64 70 
     },
65 71 
     updateBuilding() {

+ 125
- 101
文档/MYSQL/smartCommunity.pdb 파일 보기 

@@ -1,5 +1,5 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<?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"?>
2 
+<?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"?>
3 3 
 <!-- do not edit this file -->
4 4
5 5 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
 
@@ -6979,7 +6979,7 @@ LABL 0 新宋体,8,N</a:FontList>
6979 6979 
 <a:CreationDate>1557303510</a:CreationDate>
6980 6980 
 <a:ModificationDate>1557306066</a:ModificationDate>
6981 6981 
 <a:IconMode>-1</a:IconMode>
6982 
-<a:Rect>((187327,19260), (204115,48658))</a:Rect>
6982 
+<a:Rect>((187327,18810), (204115,49108))</a:Rect>
6983 6983 
 <a:LineColor>12615680</a:LineColor>
6984 6984 
 <a:FillColor>16570034</a:FillColor>
6985 6985 
 <a:ShadowColor>12632256</a:ShadowColor>
 
@@ -7104,7 +7104,7 @@ LABL 0 新宋体,8,N</a:FontList>
7104 7104 
 <a:CreationDate>1557800506</a:CreationDate>
7105 7105 
 <a:ModificationDate>1557800506</a:ModificationDate>
7106 7106 
 <a:IconMode>-1</a:IconMode>
7107 
-<a:Rect>((192811,-14911), (207867,-9813))</a:Rect>
7107 
+<a:Rect>((192811,-15361), (207867,-9363))</a:Rect>
7108 7108 
 <a:LineColor>12615680</a:LineColor>
7109 7109 
 <a:FillColor>16570034</a:FillColor>
7110 7110 
 <a:ShadowColor>12632256</a:ShadowColor>
 
@@ -17524,7 +17524,7 @@ LABL 0 新宋体,8,N</a:FontList>
17524 17524 
 <a:Code>tp_rental_house</a:Code>
17525 17525 
 <a:CreationDate>1557303510</a:CreationDate>
17526 17526 
 <a:Creator>szc</a:Creator>
17527 
-<a:ModificationDate>1557307546</a:ModificationDate>
17527 
+<a:ModificationDate>1557813818</a:ModificationDate>
17528 17528 
 <a:Modifier>szc</a:Modifier>
17529 17529 
 <a:Comment>出租公寓表</a:Comment>
17530 17530 
 <a:TotalSavingCurrency/>
 
@@ -17543,6 +17543,18 @@ LABL 0 新宋体,8,N</a:FontList>
17543 17543 
 <a:Column.Mandatory>1</a:Column.Mandatory>
17544 17544 
 </o:Column>
17545 17545 
 <o:Column Id="o1021">
17546 
+<a:ObjectID>8AE70562-18C0-45C6-BF15-FCAA422F59C2</a:ObjectID>
17547 
+<a:Name>community_id</a:Name>
17548 
+<a:Code>community_id</a:Code>
17549 
+<a:CreationDate>1557813774</a:CreationDate>
17550 
+<a:Creator>szc</a:Creator>
17551 
+<a:ModificationDate>1557813818</a:ModificationDate>
17552 
+<a:Modifier>szc</a:Modifier>
17553 
+<a:Comment>我们系统的小区ID</a:Comment>
17554 
+<a:DataType>int(11)</a:DataType>
17555 
+<a:Length>11</a:Length>
17556 
+</o:Column>
17557 
+<o:Column Id="o1022">
17546 17558 
 <a:ObjectID>51C7C13C-E338-45B0-A4E6-3F88B2DE7F33</a:ObjectID>
17547 17559 
 <a:Name>house_name</a:Name>
17548 17560 
 <a:Code>house_name</a:Code>
 
@@ -17554,7 +17566,7 @@ LABL 0 新宋体,8,N</a:FontList>
17554 17566 
 <a:DataType>varchar(255)</a:DataType>
17555 17567 
 <a:Length>255</a:Length>
17556 17568 
 </o:Column>
17557 
-<o:Column Id="o1022">
17569 
+<o:Column Id="o1023">
17558 17570 
 <a:ObjectID>CB9AD670-AD18-4424-9385-AB1105DCE3CB</a:ObjectID>
17559 17571 
 <a:Name>rental_price</a:Name>
17560 17572 
 <a:Code>rental_price</a:Code>
 
@@ -17566,7 +17578,7 @@ LABL 0 新宋体,8,N</a:FontList>
17566 17578 
 <a:DataType>varchar(255)</a:DataType>
17567 17579 
 <a:Length>255</a:Length>
17568 17580 
 </o:Column>
17569 
-<o:Column Id="o1023">
17581 
+<o:Column Id="o1024">
17570 17582 
 <a:ObjectID>2D4C03FA-18B3-4835-A768-0BF06B6674B2</a:ObjectID>
17571 17583 
 <a:Name>area</a:Name>
17572 17584 
 <a:Code>area</a:Code>
 
@@ -17578,7 +17590,7 @@ LABL 0 新宋体,8,N</a:FontList>
17578 17590 
 <a:DataType>varchar(255)</a:DataType>
17579 17591 
 <a:Length>255</a:Length>
17580 17592 
 </o:Column>
17581 
-<o:Column Id="o1024">
17593 
+<o:Column Id="o1025">
17582 17594 
 <a:ObjectID>DE4B7575-2E0F-4439-BB2E-7B293918BCFF</a:ObjectID>
17583 17595 
 <a:Name>rental_type</a:Name>
17584 17596 
 <a:Code>rental_type</a:Code>
 
@@ -17590,7 +17602,7 @@ LABL 0 新宋体,8,N</a:FontList>
17590 17602 
 <a:DataType>varchar(255)</a:DataType>
17591 17603 
 <a:Length>255</a:Length>
17592 17604 
 </o:Column>
17593 
-<o:Column Id="o1025">
17605 
+<o:Column Id="o1026">
17594 17606 
 <a:ObjectID>09D9CD83-643E-407F-B521-D0B808271727</a:ObjectID>
17595 17607 
 <a:Name>house_type</a:Name>
17596 17608 
 <a:Code>house_type</a:Code>
 
@@ -17602,7 +17614,7 @@ LABL 0 新宋体,8,N</a:FontList>
17602 17614 
 <a:DataType>varchar(255)</a:DataType>
17603 17615 
 <a:Length>255</a:Length>
17604 17616 
 </o:Column>
17605 
-<o:Column Id="o1026">
17617 
+<o:Column Id="o1027">
17606 17618 
 <a:ObjectID>CF14CF64-1763-4792-8D75-D010840925A8</a:ObjectID>
17607 17619 
 <a:Name>house_status</a:Name>
17608 17620 
 <a:Code>house_status</a:Code>
 
@@ -17614,7 +17626,7 @@ LABL 0 新宋体,8,N</a:FontList>
17614 17626 
 <a:DataType>varchar(255)</a:DataType>
17615 17627 
 <a:Length>255</a:Length>
17616 17628 
 </o:Column>
17617 
-<o:Column Id="o1027">
17629 
+<o:Column Id="o1028">
17618 17630 
 <a:ObjectID>F676264A-1683-4D62-BBB4-F18F705B4C63</a:ObjectID>
17619 17631 
 <a:Name>house_level</a:Name>
17620 17632 
 <a:Code>house_level</a:Code>
 
@@ -17626,7 +17638,7 @@ LABL 0 新宋体,8,N</a:FontList>
17626 17638 
 <a:DataType>varchar(255)</a:DataType>
17627 17639 
 <a:Length>255</a:Length>
17628 17640 
 </o:Column>
17629 
-<o:Column Id="o1028">
17641 
+<o:Column Id="o1029">
17630 17642 
 <a:ObjectID>D56459F7-EC5C-4508-84C0-4BBEF2ADA53D</a:ObjectID>
17631 17643 
 <a:Name>house_label</a:Name>
17632 17644 
 <a:Code>house_label</a:Code>
 
@@ -17638,7 +17650,7 @@ LABL 0 新宋体,8,N</a:FontList>
17638 17650 
 <a:DataType>varchar(255)</a:DataType>
17639 17651 
 <a:Length>255</a:Length>
17640 17652 
 </o:Column>
17641 
-<o:Column Id="o1029">
17653 
+<o:Column Id="o1030">
17642 17654 
 <a:ObjectID>C9B94A82-C5AA-4826-9909-E564BF1B5E0A</a:ObjectID>
17643 17655 
 <a:Name>sort</a:Name>
17644 17656 
 <a:Code>sort</a:Code>
 
@@ -17650,7 +17662,7 @@ LABL 0 新宋体,8,N</a:FontList>
17650 17662 
 <a:DataType>int(11)</a:DataType>
17651 17663 
 <a:Length>11</a:Length>
17652 17664 
 </o:Column>
17653 
-<o:Column Id="o1030">
17665 
+<o:Column Id="o1031">
17654 17666 
 <a:ObjectID>9B121749-83C8-4367-8A35-1D05D64102B1</a:ObjectID>
17655 17667 
 <a:Name>house_tel</a:Name>
17656 17668 
 <a:Code>house_tel</a:Code>
 
@@ -17662,7 +17674,7 @@ LABL 0 新宋体,8,N</a:FontList>
17662 17674 
 <a:DataType>varchar(255)</a:DataType>
17663 17675 
 <a:Length>255</a:Length>
17664 17676 
 </o:Column>
17665 
-<o:Column Id="o1031">
17677 
+<o:Column Id="o1032">
17666 17678 
 <a:ObjectID>FE137449-0BEF-4A20-AC8F-475CA8BF4F2E</a:ObjectID>
17667 17679 
 <a:Name>community_address</a:Name>
17668 17680 
 <a:Code>community_address</a:Code>
 
@@ -17674,7 +17686,7 @@ LABL 0 新宋体,8,N</a:FontList>
17674 17686 
 <a:DataType>varchar(255)</a:DataType>
17675 17687 
 <a:Length>255</a:Length>
17676 17688 
 </o:Column>
17677 
-<o:Column Id="o1032">
17689 
+<o:Column Id="o1033">
17678 17690 
 <a:ObjectID>34B0089B-9EA6-436B-B236-B087A3CE73E5</a:ObjectID>
17679 17691 
 <a:Name>community_longitude</a:Name>
17680 17692 
 <a:Code>community_longitude</a:Code>
 
@@ -17686,7 +17698,7 @@ LABL 0 新宋体,8,N</a:FontList>
17686 17698 
 <a:DataType>varchar(255)</a:DataType>
17687 17699 
 <a:Length>255</a:Length>
17688 17700 
 </o:Column>
17689 
-<o:Column Id="o1033">
17701 
+<o:Column Id="o1034">
17690 17702 
 <a:ObjectID>A62ABB38-54CD-4F47-8C17-D1A9342DD8FC</a:ObjectID>
17691 17703 
 <a:Name>community_latitude</a:Name>
17692 17704 
 <a:Code>community_latitude</a:Code>
 
@@ -17698,7 +17710,7 @@ LABL 0 新宋体,8,N</a:FontList>
17698 17710 
 <a:DataType>varchar(255)</a:DataType>
17699 17711 
 <a:Length>255</a:Length>
17700 17712 
 </o:Column>
17701 
-<o:Column Id="o1034">
17713 
+<o:Column Id="o1035">
17702 17714 
 <a:ObjectID>1E5C86EA-7B19-497D-BDDE-96EA66DF905F</a:ObjectID>
17703 17715 
 <a:Name>house_introduction</a:Name>
17704 17716 
 <a:Code>house_introduction</a:Code>
 
@@ -17709,7 +17721,7 @@ LABL 0 新宋体,8,N</a:FontList>
17709 17721 
 <a:Comment>房屋介绍</a:Comment>
17710 17722 
 <a:DataType>text</a:DataType>
17711 17723 
 </o:Column>
17712 
-<o:Column Id="o1035">
17724 
+<o:Column Id="o1036">
17713 17725 
 <a:ObjectID>C505FCE6-7EF3-4451-8A34-0A61EC7FE8E0</a:ObjectID>
17714 17726 
 <a:Name>bed</a:Name>
17715 17727 
 <a:Code>bed</a:Code>
 
@@ -17721,7 +17733,7 @@ LABL 0 新宋体,8,N</a:FontList>
17721 17733 
 <a:DataType>varchar(1)</a:DataType>
17722 17734 
 <a:Length>1</a:Length>
17723 17735 
 </o:Column>
17724 
-<o:Column Id="o1036">
17736 
+<o:Column Id="o1037">
17725 17737 
 <a:ObjectID>86AC4B40-FEBD-4FCB-A079-23ED794287E7</a:ObjectID>
17726 17738 
 <a:Name>wardrobe</a:Name>
17727 17739 
 <a:Code>wardrobe</a:Code>
 
@@ -17733,7 +17745,7 @@ LABL 0 新宋体,8,N</a:FontList>
17733 17745 
 <a:DataType>varchar(1)</a:DataType>
17734 17746 
 <a:Length>1</a:Length>
17735 17747 
 </o:Column>
17736 
-<o:Column Id="o1037">
17748 
+<o:Column Id="o1038">
17737 17749 
 <a:ObjectID>0F598383-042D-42FD-B7DD-5EAD70E46C1B</a:ObjectID>
17738 17750 
 <a:Name>dining_table</a:Name>
17739 17751 
 <a:Code>dining_table</a:Code>
 
@@ -17745,7 +17757,7 @@ LABL 0 新宋体,8,N</a:FontList>
17745 17757 
 <a:DataType>varchar(1)</a:DataType>
17746 17758 
 <a:Length>1</a:Length>
17747 17759 
 </o:Column>
17748 
-<o:Column Id="o1038">
17760 
+<o:Column Id="o1039">
17749 17761 
 <a:ObjectID>7FB29743-6F55-4ADD-829C-886CD8235B78</a:ObjectID>
17750 17762 
 <a:Name>computer_desk</a:Name>
17751 17763 
 <a:Code>computer_desk</a:Code>
 
@@ -17757,7 +17769,7 @@ LABL 0 新宋体,8,N</a:FontList>
17757 17769 
 <a:DataType>varchar(1)</a:DataType>
17758 17770 
 <a:Length>1</a:Length>
17759 17771 
 </o:Column>
17760 
-<o:Column Id="o1039">
17772 
+<o:Column Id="o1040">
17761 17773 
 <a:ObjectID>BD673A93-F61B-4C96-BEAD-2283ACDFAF64</a:ObjectID>
17762 17774 
 <a:Name>water_heater</a:Name>
17763 17775 
 <a:Code>water_heater</a:Code>
 
@@ -17769,7 +17781,7 @@ LABL 0 新宋体,8,N</a:FontList>
17769 17781 
 <a:DataType>varchar(1)</a:DataType>
17770 17782 
 <a:Length>1</a:Length>
17771 17783 
 </o:Column>
17772 
-<o:Column Id="o1040">
17784 
+<o:Column Id="o1041">
17773 17785 
 <a:ObjectID>4F881349-E1A5-4DE0-8010-BC61A8DF88A3</a:ObjectID>
17774 17786 
 <a:Name>chair</a:Name>
17775 17787 
 <a:Code>chair</a:Code>
 
@@ -17781,7 +17793,7 @@ LABL 0 新宋体,8,N</a:FontList>
17781 17793 
 <a:DataType>varchar(1)</a:DataType>
17782 17794 
 <a:Length>1</a:Length>
17783 17795 
 </o:Column>
17784 
-<o:Column Id="o1041">
17796 
+<o:Column Id="o1042">
17785 17797 
 <a:ObjectID>95D69A16-BEA6-4D93-AE71-BD1F110A4B26</a:ObjectID>
17786 17798 
 <a:Name>washing_machine</a:Name>
17787 17799 
 <a:Code>washing_machine</a:Code>
 
@@ -17793,7 +17805,7 @@ LABL 0 新宋体,8,N</a:FontList>
17793 17805 
 <a:DataType>varchar(1)</a:DataType>
17794 17806 
 <a:Length>1</a:Length>
17795 17807 
 </o:Column>
17796 
-<o:Column Id="o1042">
17808 
+<o:Column Id="o1043">
17797 17809 
 <a:ObjectID>DD7E6C40-AD47-4864-AFFB-FBB0E8D9121B</a:ObjectID>
17798 17810 
 <a:Name>air_conditioning</a:Name>
17799 17811 
 <a:Code>air_conditioning</a:Code>
 
@@ -17805,7 +17817,7 @@ LABL 0 新宋体,8,N</a:FontList>
17805 17817 
 <a:DataType>varchar(1)</a:DataType>
17806 17818 
 <a:Length>1</a:Length>
17807 17819 
 </o:Column>
17808 
-<o:Column Id="o1043">
17820 
+<o:Column Id="o1044">
17809 17821 
 <a:ObjectID>8F69DF57-D61E-47AB-8E05-BB0EBB0B5139</a:ObjectID>
17810 17822 
 <a:Name>table_lamp</a:Name>
17811 17823 
 <a:Code>table_lamp</a:Code>
 
@@ -17817,7 +17829,7 @@ LABL 0 新宋体,8,N</a:FontList>
17817 17829 
 <a:DataType>varchar(1)</a:DataType>
17818 17830 
 <a:Length>1</a:Length>
17819 17831 
 </o:Column>
17820 
-<o:Column Id="o1044">
17832 
+<o:Column Id="o1045">
17821 17833 
 <a:ObjectID>0A425DF5-5766-4069-BD6E-771C1676BB85</a:ObjectID>
17822 17834 
 <a:Name>WiFi</a:Name>
17823 17835 
 <a:Code>WiFi</a:Code>
 
@@ -17829,7 +17841,7 @@ LABL 0 新宋体,8,N</a:FontList>
17829 17841 
 <a:DataType>varchar(1)</a:DataType>
17830 17842 
 <a:Length>1</a:Length>
17831 17843 
 </o:Column>
17832 
-<o:Column Id="o1045">
17844 
+<o:Column Id="o1046">
17833 17845 
 <a:ObjectID>5CA481DC-A4C9-4723-B1E5-43F84387D203</a:ObjectID>
17834 17846 
 <a:Name>microwave_oven</a:Name>
17835 17847 
 <a:Code>microwave_oven</a:Code>
 
@@ -17841,7 +17853,7 @@ LABL 0 新宋体,8,N</a:FontList>
17841 17853 
 <a:DataType>varchar(1)</a:DataType>
17842 17854 
 <a:Length>1</a:Length>
17843 17855 
 </o:Column>
17844 
-<o:Column Id="o1046">
17856 
+<o:Column Id="o1047">
17845 17857 
 <a:ObjectID>8100898B-1949-4F10-B73D-47B3D94A8826</a:ObjectID>
17846 17858 
 <a:Name>natural_gas</a:Name>
17847 17859 
 <a:Code>natural_gas</a:Code>
 
@@ -17853,7 +17865,7 @@ LABL 0 新宋体,8,N</a:FontList>
17853 17865 
 <a:DataType>varchar(1)</a:DataType>
17854 17866 
 <a:Length>1</a:Length>
17855 17867 
 </o:Column>
17856 
-<o:Column Id="o1047">
17868 
+<o:Column Id="o1048">
17857 17869 
 <a:ObjectID>86966D69-2983-4EEE-B469-B2630F47E55E</a:ObjectID>
17858 17870 
 <a:Name>create_date</a:Name>
17859 17871 
 <a:Code>create_date</a:Code>
 
@@ -17864,7 +17876,7 @@ LABL 0 新宋体,8,N</a:FontList>
17864 17876 
 <a:Comment>创建时间</a:Comment>
17865 17877 
 <a:DataType>datetime</a:DataType>
17866 17878 
 </o:Column>
17867 
-<o:Column Id="o1048">
17879 
+<o:Column Id="o1049">
17868 17880 
 <a:ObjectID>0E612C68-BF9C-4454-889C-68B6A3CAF9CB</a:ObjectID>
17869 17881 
 <a:Name>create_user</a:Name>
17870 17882 
 <a:Code>create_user</a:Code>
 
@@ -17876,7 +17888,7 @@ LABL 0 新宋体,8,N</a:FontList>
17876 17888 
 <a:DataType>int(11)</a:DataType>
17877 17889 
 <a:Length>11</a:Length>
17878 17890 
 </o:Column>
17879 
-<o:Column Id="o1049">
17891 
+<o:Column Id="o1050">
17880 17892 
 <a:ObjectID>44888D0B-ED44-4152-A948-FE2738CD4730</a:ObjectID>
17881 17893 
 <a:Name>update_date</a:Name>
17882 17894 
 <a:Code>update_date</a:Code>
 
@@ -17887,7 +17899,7 @@ LABL 0 新宋体,8,N</a:FontList>
17887 17899 
 <a:Comment>更新时间</a:Comment>
17888 17900 
 <a:DataType>datetime</a:DataType>
17889 17901 
 </o:Column>
17890 
-<o:Column Id="o1050">
17902 
+<o:Column Id="o1051">
17891 17903 
 <a:ObjectID>9ACA9B2C-9A46-43EC-AB23-5DD83CED5EF2</a:ObjectID>
17892 17904 
 <a:Name>update_user</a:Name>
17893 17905 
 <a:Code>update_user</a:Code>
 
@@ -17901,7 +17913,7 @@ LABL 0 新宋体,8,N</a:FontList>
17901 17913 
 </o:Column>
17902 17914 
 </c:Columns>
17903 17915 
 <c:Keys>
17904 
-<o:Key Id="o1051">
17916 
+<o:Key Id="o1052">
17905 17917 
 <a:ObjectID>148EAD21-CFA4-42E6-9F44-C31E1C508685</a:ObjectID>
17906 17918 
 <a:Name>Key_1</a:Name>
17907 17919 
 <a:Code>Key_1</a:Code>
 
@@ -17915,7 +17927,7 @@ LABL 0 新宋体,8,N</a:FontList>
17915 17927 
 </o:Key>
17916 17928 
 </c:Keys>
17917 17929 
 <c:PrimaryKey>
17918 
-<o:Key Ref="o1051"/>
17930 
+<o:Key Ref="o1052"/>
17919 17931 
 </c:PrimaryKey>
17920 17932 
 </o:Table>
17921 17933 
 <o:Table Id="o253">
 
@@ -17929,7 +17941,7 @@ LABL 0 新宋体,8,N</a:FontList>
17929 17941 
 <a:Comment>商铺图片</a:Comment>
17930 17942 
 <a:TotalSavingCurrency/>
17931 17943 
 <c:Columns>
17932 
-<o:Column Id="o1052">
17944 
+<o:Column Id="o1053">
17933 17945 
 <a:ObjectID>92BB3B4E-28C8-452C-B070-4A0755DE3BBC</a:ObjectID>
17934 17946 
 <a:Name>id</a:Name>
17935 17947 
 <a:Code>id</a:Code>
 
@@ -17942,7 +17954,7 @@ LABL 0 新宋体,8,N</a:FontList>
17942 17954 
 <a:Identity>1</a:Identity>
17943 17955 
 <a:Column.Mandatory>1</a:Column.Mandatory>
17944 17956 
 </o:Column>
17945 
-<o:Column Id="o1053">
17957 
+<o:Column Id="o1054">
17946 17958 
 <a:ObjectID>21087CE1-7882-4A27-ACD7-E1579649B207</a:ObjectID>
17947 17959 
 <a:Name>community_id</a:Name>
17948 17960 
 <a:Code>community_id</a:Code>
 
@@ -17954,7 +17966,7 @@ LABL 0 新宋体,8,N</a:FontList>
17954 17966 
 <a:DataType>int(11)</a:DataType>
17955 17967 
 <a:Length>11</a:Length>
17956 17968 
 </o:Column>
17957 
-<o:Column Id="o1054">
17969 
+<o:Column Id="o1055">
17958 17970 
 <a:ObjectID>6B2B261C-902C-41CE-848E-FF27C66FE85B</a:ObjectID>
17959 17971 
 <a:Name>shop_id</a:Name>
17960 17972 
 <a:Code>shop_id</a:Code>
 
@@ -17966,7 +17978,7 @@ LABL 0 新宋体,8,N</a:FontList>
17966 17978 
 <a:DataType>int(11)</a:DataType>
17967 17979 
 <a:Length>11</a:Length>
17968 17980 
 </o:Column>
17969 
-<o:Column Id="o1055">
17981 
+<o:Column Id="o1056">
17970 17982 
 <a:ObjectID>1903CA52-9255-47A8-9B59-B8CA06D703E0</a:ObjectID>
17971 17983 
 <a:Name>img_url</a:Name>
17972 17984 
 <a:Code>img_url</a:Code>
 
@@ -17978,7 +17990,7 @@ LABL 0 新宋体,8,N</a:FontList>
17978 17990 
 <a:DataType>varchar(255)</a:DataType>
17979 17991 
 <a:Length>255</a:Length>
17980 17992 
 </o:Column>
17981 
-<o:Column Id="o1056">
17993 
+<o:Column Id="o1057">
17982 17994 
 <a:ObjectID>D12DC8AD-CF58-4DE5-A9DC-ABB63D349D13</a:ObjectID>
17983 17995 
 <a:Name>img_type</a:Name>
17984 17996 
 <a:Code>img_type</a:Code>
 
@@ -17990,7 +18002,7 @@ LABL 0 新宋体,8,N</a:FontList>
17990 18002 
 <a:DataType>varchar(2)</a:DataType>
17991 18003 
 <a:Length>2</a:Length>
17992 18004 
 </o:Column>
17993 
-<o:Column Id="o1057">
18005 
+<o:Column Id="o1058">
17994 18006 
 <a:ObjectID>5BC7B1D6-E34E-4473-9DF1-CA6240B1C23F</a:ObjectID>
17995 18007 
 <a:Name>create_date</a:Name>
17996 18008 
 <a:Code>create_date</a:Code>
 
@@ -18003,7 +18015,7 @@ LABL 0 新宋体,8,N</a:FontList>
18003 18015 
 </o:Column>
18004 18016 
 </c:Columns>
18005 18017 
 <c:Keys>
18006 
-<o:Key Id="o1058">
18018 
+<o:Key Id="o1059">
18007 18019 
 <a:ObjectID>6EEDA542-1E85-47A3-BC57-7C65558D93D0</a:ObjectID>
18008 18020 
 <a:Name>Key_1</a:Name>
18009 18021 
 <a:Code>Key_1</a:Code>
 
@@ -18012,12 +18024,12 @@ LABL 0 新宋体,8,N</a:FontList>
18012 18024 
 <a:ModificationDate>1557304098</a:ModificationDate>
18013 18025 
 <a:Modifier>szc</a:Modifier>
18014 18026 
 <c:Key.Columns>
18015 
-<o:Column Ref="o1052"/>
18027 
+<o:Column Ref="o1053"/>
18016 18028 
 </c:Key.Columns>
18017 18029 
 </o:Key>
18018 18030 
 </c:Keys>
18019 18031 
 <c:PrimaryKey>
18020 
-<o:Key Ref="o1058"/>
18032 
+<o:Key Ref="o1059"/>
18021 18033 
 </c:PrimaryKey>
18022 18034 
 </o:Table>
18023 18035 
 <o:Table Id="o255">
 
@@ -18031,7 +18043,7 @@ LABL 0 新宋体,8,N</a:FontList>
18031 18043 
 <a:Comment>出租房间图片</a:Comment>
18032 18044 
 <a:TotalSavingCurrency/>
18033 18045 
 <c:Columns>
18034 
-<o:Column Id="o1059">
18046 
+<o:Column Id="o1060">
18035 18047 
 <a:ObjectID>98ED7313-E915-44A1-9D4F-80F5BC057C88</a:ObjectID>
18036 18048 
 <a:Name>id</a:Name>
18037 18049 
 <a:Code>id</a:Code>
 
@@ -18044,7 +18056,7 @@ LABL 0 新宋体,8,N</a:FontList>
18044 18056 
 <a:Identity>1</a:Identity>
18045 18057 
 <a:Column.Mandatory>1</a:Column.Mandatory>
18046 18058 
 </o:Column>
18047 
-<o:Column Id="o1060">
18059 
+<o:Column Id="o1061">
18048 18060 
 <a:ObjectID>C9DD2C07-B914-4F63-AFCD-05FA9EEC9184</a:ObjectID>
18049 18061 
 <a:Name>community_id</a:Name>
18050 18062 
 <a:Code>community_id</a:Code>
 
@@ -18056,7 +18068,7 @@ LABL 0 新宋体,8,N</a:FontList>
18056 18068 
 <a:DataType>int(11)</a:DataType>
18057 18069 
 <a:Length>11</a:Length>
18058 18070 
 </o:Column>
18059 
-<o:Column Id="o1061">
18071 
+<o:Column Id="o1062">
18060 18072 
 <a:ObjectID>B557681C-3BC2-492A-9313-38454B3D480A</a:ObjectID>
18061 18073 
 <a:Name>rental_house_id</a:Name>
18062 18074 
 <a:Code>rental_house_id</a:Code>
 
@@ -18068,7 +18080,7 @@ LABL 0 新宋体,8,N</a:FontList>
18068 18080 
 <a:DataType>int(11)</a:DataType>
18069 18081 
 <a:Length>11</a:Length>
18070 18082 
 </o:Column>
18071 
-<o:Column Id="o1062">
18083 
+<o:Column Id="o1063">
18072 18084 
 <a:ObjectID>7EFF853D-17E5-459D-8942-60286B8BF991</a:ObjectID>
18073 18085 
 <a:Name>img_url</a:Name>
18074 18086 
 <a:Code>img_url</a:Code>
 
@@ -18080,7 +18092,7 @@ LABL 0 新宋体,8,N</a:FontList>
18080 18092 
 <a:DataType>varchar(255)</a:DataType>
18081 18093 
 <a:Length>255</a:Length>
18082 18094 
 </o:Column>
18083 
-<o:Column Id="o1063">
18095 
+<o:Column Id="o1064">
18084 18096 
 <a:ObjectID>986D1A7D-1053-4346-AD5C-D64AEE62DD3F</a:ObjectID>
18085 18097 
 <a:Name>img_type</a:Name>
18086 18098 
 <a:Code>img_type</a:Code>
 
@@ -18092,7 +18104,7 @@ LABL 0 新宋体,8,N</a:FontList>
18092 18104 
 <a:DataType>varchar(2)</a:DataType>
18093 18105 
 <a:Length>2</a:Length>
18094 18106 
 </o:Column>
18095 
-<o:Column Id="o1064">
18107 
+<o:Column Id="o1065">
18096 18108 
 <a:ObjectID>A094BD2C-60B5-4AC9-A98E-176D07F29C66</a:ObjectID>
18097 18109 
 <a:Name>create_date</a:Name>
18098 18110 
 <a:Code>create_date</a:Code>
 
@@ -18105,7 +18117,7 @@ LABL 0 新宋体,8,N</a:FontList>
18105 18117 
 </o:Column>
18106 18118 
 </c:Columns>
18107 18119 
 <c:Keys>
18108 
-<o:Key Id="o1065">
18120 
+<o:Key Id="o1066">
18109 18121 
 <a:ObjectID>F8E42723-01EE-48CA-B9B4-9B70D9EE52C2</a:ObjectID>
18110 18122 
 <a:Name>Key_1</a:Name>
18111 18123 
 <a:Code>Key_1</a:Code>
 
@@ -18114,12 +18126,12 @@ LABL 0 新宋体,8,N</a:FontList>
18114 18126 
 <a:ModificationDate>1557307564</a:ModificationDate>
18115 18127 
 <a:Modifier>szc</a:Modifier>
18116 18128 
 <c:Key.Columns>
18117 
-<o:Column Ref="o1059"/>
18129 
+<o:Column Ref="o1060"/>
18118 18130 
 </c:Key.Columns>
18119 18131 
 </o:Key>
18120 18132 
 </c:Keys>
18121 18133 
 <c:PrimaryKey>
18122 
-<o:Key Ref="o1065"/>
18134 
+<o:Key Ref="o1066"/>
18123 18135 
 </c:PrimaryKey>
18124 18136 
 </o:Table>
18125 18137 
 <o:Table Id="o256">
 
@@ -18133,7 +18145,7 @@ LABL 0 新宋体,8,N</a:FontList>
18133 18145 
 <a:Comment>用户车牌号表</a:Comment>
18134 18146 
 <a:TotalSavingCurrency/>
18135 18147 
 <c:Columns>
18136 
-<o:Column Id="o1066">
18148 
+<o:Column Id="o1067">
18137 18149 
 <a:ObjectID>2ADC4DD9-6B52-46D7-80A7-0B269251996F</a:ObjectID>
18138 18150 
 <a:Name>id</a:Name>
18139 18151 
 <a:Code>id</a:Code>
 
@@ -18146,7 +18158,7 @@ LABL 0 新宋体,8,N</a:FontList>
18146 18158 
 <a:Identity>1</a:Identity>
18147 18159 
 <a:Column.Mandatory>1</a:Column.Mandatory>
18148 18160 
 </o:Column>
18149 
-<o:Column Id="o1067">
18161 
+<o:Column Id="o1068">
18150 18162 
 <a:ObjectID>B2476244-EFC3-4FF8-A728-50D1941D12BB</a:ObjectID>
18151 18163 
 <a:Name>community_id</a:Name>
18152 18164 
 <a:Code>community_id</a:Code>
 
@@ -18158,7 +18170,7 @@ LABL 0 新宋体,8,N</a:FontList>
18158 18170 
 <a:DataType>int(11)</a:DataType>
18159 18171 
 <a:Length>11</a:Length>
18160 18172 
 </o:Column>
18161 
-<o:Column Id="o1068">
18173 
+<o:Column Id="o1069">
18162 18174 
 <a:ObjectID>D4FE9889-F81C-40A2-9777-99934795E873</a:ObjectID>
18163 18175 
 <a:Name>ta_user_id</a:Name>
18164 18176 
 <a:Code>ta_user_id</a:Code>
 
@@ -18170,7 +18182,7 @@ LABL 0 新宋体,8,N</a:FontList>
18170 18182 
 <a:DataType>int(11)</a:DataType>
18171 18183 
 <a:Length>11</a:Length>
18172 18184 
 </o:Column>
18173 
-<o:Column Id="o1069">
18185 
+<o:Column Id="o1070">
18174 18186 
 <a:ObjectID>9AF156AE-3592-4A2F-ADD4-AF7D94A024F2</a:ObjectID>
18175 18187 
 <a:Name>license_plate</a:Name>
18176 18188 
 <a:Code>license_plate</a:Code>
 
@@ -18182,7 +18194,7 @@ LABL 0 新宋体,8,N</a:FontList>
18182 18194 
 <a:DataType>varchar(255)</a:DataType>
18183 18195 
 <a:Length>255</a:Length>
18184 18196 
 </o:Column>
18185 
-<o:Column Id="o1070">
18197 
+<o:Column Id="o1071">
18186 18198 
 <a:ObjectID>4AF2667F-B53D-4CAB-9DF9-7388FD52766D</a:ObjectID>
18187 18199 
 <a:Name>order_number</a:Name>
18188 18200 
 <a:Code>order_number</a:Code>
 
@@ -18194,7 +18206,7 @@ LABL 0 新宋体,8,N</a:FontList>
18194 18206 
 <a:DataType>varchar(255)</a:DataType>
18195 18207 
 <a:Length>255</a:Length>
18196 18208 
 </o:Column>
18197 
-<o:Column Id="o1071">
18209 
+<o:Column Id="o1072">
18198 18210 
 <a:ObjectID>33679CF5-35FC-4B38-9BFA-D008AFEB89C3</a:ObjectID>
18199 18211 
 <a:Name>expire_date</a:Name>
18200 18212 
 <a:Code>expire_date</a:Code>
 
@@ -18205,7 +18217,7 @@ LABL 0 新宋体,8,N</a:FontList>
18205 18217 
 <a:Comment>到期时间</a:Comment>
18206 18218 
 <a:DataType>datetime</a:DataType>
18207 18219 
 </o:Column>
18208 
-<o:Column Id="o1072">
18220 
+<o:Column Id="o1073">
18209 18221 
 <a:ObjectID>57CE5A0C-2BD4-4B1F-AED4-D8FFB7C53768</a:ObjectID>
18210 18222 
 <a:Name>unit_price</a:Name>
18211 18223 
 <a:Code>unit_price</a:Code>
 
@@ -18217,7 +18229,7 @@ LABL 0 新宋体,8,N</a:FontList>
18217 18229 
 <a:DataType>varchar(255)</a:DataType>
18218 18230 
 <a:Length>255</a:Length>
18219 18231 
 </o:Column>
18220 
-<o:Column Id="o1073">
18232 
+<o:Column Id="o1074">
18221 18233 
 <a:ObjectID>593C14C2-DC52-447D-9901-15585EB3D25E</a:ObjectID>
18222 18234 
 <a:Name>parking_lot</a:Name>
18223 18235 
 <a:Code>parking_lot</a:Code>
 
@@ -18229,7 +18241,7 @@ LABL 0 新宋体,8,N</a:FontList>
18229 18241 
 <a:DataType>varchar(255)</a:DataType>
18230 18242 
 <a:Length>255</a:Length>
18231 18243 
 </o:Column>
18232 
-<o:Column Id="o1074">
18244 
+<o:Column Id="o1075">
18233 18245 
 <a:ObjectID>B11B597D-C188-4F86-B983-1247AAC74386</a:ObjectID>
18234 18246 
 <a:Name>renew_time</a:Name>
18235 18247 
 <a:Code>renew_time</a:Code>
 
@@ -18241,7 +18253,7 @@ LABL 0 新宋体,8,N</a:FontList>
18241 18253 
 <a:DataType>int(11)</a:DataType>
18242 18254 
 <a:Length>11</a:Length>
18243 18255 
 </o:Column>
18244 
-<o:Column Id="o1075">
18256 
+<o:Column Id="o1076">
18245 18257 
 <a:ObjectID>B9A4F75B-5600-4E03-97CA-F52659AF4566</a:ObjectID>
18246 18258 
 <a:Name>license_type</a:Name>
18247 18259 
 <a:Code>license_type</a:Code>
 
@@ -18253,7 +18265,7 @@ LABL 0 新宋体,8,N</a:FontList>
18253 18265 
 <a:DataType>int(11)</a:DataType>
18254 18266 
 <a:Length>11</a:Length>
18255 18267 
 </o:Column>
18256 
-<o:Column Id="o1076">
18268 
+<o:Column Id="o1077">
18257 18269 
 <a:ObjectID>00FA4FFC-5A5F-4873-881A-EA8B4C2639BD</a:ObjectID>
18258 18270 
 <a:Name>create_date</a:Name>
18259 18271 
 <a:Code>create_date</a:Code>
 
@@ -18264,7 +18276,7 @@ LABL 0 新宋体,8,N</a:FontList>
18264 18276 
 <a:Comment>创建时间</a:Comment>
18265 18277 
 <a:DataType>datetime</a:DataType>
18266 18278 
 </o:Column>
18267 
-<o:Column Id="o1077">
18279 
+<o:Column Id="o1078">
18268 18280 
 <a:ObjectID>C3559530-E9AA-4BB9-A794-582963C4A4BF</a:ObjectID>
18269 18281 
 <a:Name>create_user</a:Name>
18270 18282 
 <a:Code>create_user</a:Code>
 
@@ -18276,7 +18288,7 @@ LABL 0 新宋体,8,N</a:FontList>
18276 18288 
 <a:DataType>int(11)</a:DataType>
18277 18289 
 <a:Length>11</a:Length>
18278 18290 
 </o:Column>
18279 
-<o:Column Id="o1078">
18291 
+<o:Column Id="o1079">
18280 18292 
 <a:ObjectID>AD4AC6D5-678E-49FC-93B0-BB84F617CD00</a:ObjectID>
18281 18293 
 <a:Name>update_date</a:Name>
18282 18294 
 <a:Code>update_date</a:Code>
 
@@ -18287,7 +18299,7 @@ LABL 0 新宋体,8,N</a:FontList>
18287 18299 
 <a:Comment>更新时间</a:Comment>
18288 18300 
 <a:DataType>datetime</a:DataType>
18289 18301 
 </o:Column>
18290 
-<o:Column Id="o1079">
18302 
+<o:Column Id="o1080">
18291 18303 
 <a:ObjectID>85836F40-5F4D-4AB8-9DC7-2345ED8AE5DA</a:ObjectID>
18292 18304 
 <a:Name>update_user</a:Name>
18293 18305 
 <a:Code>update_user</a:Code>
 
@@ -18301,7 +18313,7 @@ LABL 0 新宋体,8,N</a:FontList>
18301 18313 
 </o:Column>
18302 18314 
 </c:Columns>
18303 18315 
 <c:Keys>
18304 
-<o:Key Id="o1080">
18316 
+<o:Key Id="o1081">
18305 18317 
 <a:ObjectID>63206026-120F-43C3-AF49-7BF7198EAA64</a:ObjectID>
18306 18318 
 <a:Name>Key_1</a:Name>
18307 18319 
 <a:Code>Key_1</a:Code>
 
@@ -18310,12 +18322,12 @@ LABL 0 新宋体,8,N</a:FontList>
18310 18322 
 <a:ModificationDate>1557367718</a:ModificationDate>
18311 18323 
 <a:Modifier>szc</a:Modifier>
18312 18324 
 <c:Key.Columns>
18313 
-<o:Column Ref="o1066"/>
18325 
+<o:Column Ref="o1067"/>
18314 18326 
 </c:Key.Columns>
18315 18327 
 </o:Key>
18316 18328 
 </c:Keys>
18317 18329 
 <c:PrimaryKey>
18318 
-<o:Key Ref="o1080"/>
18330 
+<o:Key Ref="o1081"/>
18319 18331 
 </c:PrimaryKey>
18320 18332 
 </o:Table>
18321 18333 
 <o:Table Id="o257">
 
@@ -18329,7 +18341,7 @@ LABL 0 新宋体,8,N</a:FontList>
18329 18341 
 <a:Comment>月租车缴费订单表</a:Comment>
18330 18342 
 <a:TotalSavingCurrency/>
18331 18343 
 <c:Columns>
18332 
-<o:Column Id="o1081">
18344 
+<o:Column Id="o1082">
18333 18345 
 <a:ObjectID>08F36182-AB22-433F-8F51-E805E2ACC919</a:ObjectID>
18334 18346 
 <a:Name>id</a:Name>
18335 18347 
 <a:Code>id</a:Code>
 
@@ -18342,7 +18354,7 @@ LABL 0 新宋体,8,N</a:FontList>
18342 18354 
 <a:Identity>1</a:Identity>
18343 18355 
 <a:Column.Mandatory>1</a:Column.Mandatory>
18344 18356 
 </o:Column>
18345 
-<o:Column Id="o1082">
18357 
+<o:Column Id="o1083">
18346 18358 
 <a:ObjectID>45D65D52-E45F-466F-B13D-4BAB7431D881</a:ObjectID>
18347 18359 
 <a:Name>community_id</a:Name>
18348 18360 
 <a:Code>community_id</a:Code>
 
@@ -18354,7 +18366,7 @@ LABL 0 新宋体,8,N</a:FontList>
18354 18366 
 <a:DataType>int(11)</a:DataType>
18355 18367 
 <a:Length>11</a:Length>
18356 18368 
 </o:Column>
18357 
-<o:Column Id="o1083">
18369 
+<o:Column Id="o1084">
18358 18370 
 <a:ObjectID>80318F85-BB20-4024-9998-D987A98B2C8F</a:ObjectID>
18359 18371 
 <a:Name>user_license_id</a:Name>
18360 18372 
 <a:Code>ta_user_id</a:Code>
 
@@ -18366,7 +18378,7 @@ LABL 0 新宋体,8,N</a:FontList>
18366 18378 
 <a:DataType>int(11)</a:DataType>
18367 18379 
 <a:Length>11</a:Length>
18368 18380 
 </o:Column>
18369 
-<o:Column Id="o1084">
18381 
+<o:Column Id="o1085">
18370 18382 
 <a:ObjectID>63010136-6F76-4F2E-970D-D599445EE9B0</a:ObjectID>
18371 18383 
 <a:Name>order_number</a:Name>
18372 18384 
 <a:Code>order_number</a:Code>
 
@@ -18378,7 +18390,7 @@ LABL 0 新宋体,8,N</a:FontList>
18378 18390 
 <a:DataType>varchar(255)</a:DataType>
18379 18391 
 <a:Length>255</a:Length>
18380 18392 
 </o:Column>
18381 
-<o:Column Id="o1085">
18393 
+<o:Column Id="o1086">
18382 18394 
 <a:ObjectID>D575E6DD-CE84-4ED5-8208-C3C936932B7B</a:ObjectID>
18383 18395 
 <a:Name>order_status</a:Name>
18384 18396 
 <a:Code>order_status</a:Code>
 
@@ -18390,7 +18402,7 @@ LABL 0 新宋体,8,N</a:FontList>
18390 18402 
 <a:DataType>varchar(255)</a:DataType>
18391 18403 
 <a:Length>255</a:Length>
18392 18404 
 </o:Column>
18393 
-<o:Column Id="o1086">
18405 
+<o:Column Id="o1087">
18394 18406 
 <a:ObjectID>2D0B1C89-FCE7-43EB-9E46-3814A128EAA1</a:ObjectID>
18395 18407 
 <a:Name>create_user</a:Name>
18396 18408 
 <a:Code>create_user</a:Code>
 
@@ -18402,7 +18414,7 @@ LABL 0 新宋体,8,N</a:FontList>
18402 18414 
 <a:DataType>int(11)</a:DataType>
18403 18415 
 <a:Length>11</a:Length>
18404 18416 
 </o:Column>
18405 
-<o:Column Id="o1087">
18417 
+<o:Column Id="o1088">
18406 18418 
 <a:ObjectID>A1476C8B-868D-4B30-ACD0-08C86C003A27</a:ObjectID>
18407 18419 
 <a:Name>create_date</a:Name>
18408 18420 
 <a:Code>create_date</a:Code>
 
@@ -18413,7 +18425,7 @@ LABL 0 新宋体,8,N</a:FontList>
18413 18425 
 <a:Comment>创建时间</a:Comment>
18414 18426 
 <a:DataType>datetime</a:DataType>
18415 18427 
 </o:Column>
18416 
-<o:Column Id="o1088">
18428 
+<o:Column Id="o1089">
18417 18429 
 <a:ObjectID>BE3B494A-E8E4-421E-A871-FD700644271F</a:ObjectID>
18418 18430 
 <a:Name>update_user</a:Name>
18419 18431 
 <a:Code>update_user</a:Code>
 
@@ -18425,7 +18437,7 @@ LABL 0 新宋体,8,N</a:FontList>
18425 18437 
 <a:DataType>int(11)</a:DataType>
18426 18438 
 <a:Length>11</a:Length>
18427 18439 
 </o:Column>
18428 
-<o:Column Id="o1089">
18440 
+<o:Column Id="o1090">
18429 18441 
 <a:ObjectID>A34F3B8C-7F9A-41ED-BD96-44A95D08C547</a:ObjectID>
18430 18442 
 <a:Name>update_date</a:Name>
18431 18443 
 <a:Code>update_date</a:Code>
 
@@ -18436,7 +18448,7 @@ LABL 0 新宋体,8,N</a:FontList>
18436 18448 
 <a:Comment>更新时间</a:Comment>
18437 18449 
 <a:DataType>datetime</a:DataType>
18438 18450 
 </o:Column>
18439 
-<o:Column Id="o1090">
18451 
+<o:Column Id="o1091">
18440 18452 
 <a:ObjectID>8EA7049C-94A1-453E-B283-8E79F440BCEB</a:ObjectID>
18441 18453 
 <a:Name>extension_month</a:Name>
18442 18454 
 <a:Code>extension_month</a:Code>
 
@@ -18448,7 +18460,7 @@ LABL 0 新宋体,8,N</a:FontList>
18448 18460 
 <a:DataType>int(11)</a:DataType>
18449 18461 
 <a:Length>11</a:Length>
18450 18462 
 </o:Column>
18451 
-<o:Column Id="o1091">
18463 
+<o:Column Id="o1092">
18452 18464 
 <a:ObjectID>749D6A1D-5072-45E8-9826-22579FD72F1F</a:ObjectID>
18453 18465 
 <a:Name>extension_price</a:Name>
18454 18466 
 <a:Code>extension_price</a:Code>
 
@@ -18460,7 +18472,7 @@ LABL 0 新宋体,8,N</a:FontList>
18460 18472 
 <a:DataType>varchar(255)</a:DataType>
18461 18473 
 <a:Length>255</a:Length>
18462 18474 
 </o:Column>
18463 
-<o:Column Id="o1092">
18475 
+<o:Column Id="o1093">
18464 18476 
 <a:ObjectID>E0395793-A050-4735-96E3-F17749B36CEC</a:ObjectID>
18465 18477 
 <a:Name>payment_tel</a:Name>
18466 18478 
 <a:Code>payment_tel</a:Code>
 
@@ -18472,7 +18484,7 @@ LABL 0 新宋体,8,N</a:FontList>
18472 18484 
 <a:DataType>varchar(255)</a:DataType>
18473 18485 
 <a:Length>255</a:Length>
18474 18486 
 </o:Column>
18475 
-<o:Column Id="o1093">
18487 
+<o:Column Id="o1094">
18476 18488 
 <a:ObjectID>3D0DBFAF-ACCA-4178-AEC7-478CABDABE68</a:ObjectID>
18477 18489 
 <a:Name>payment_name</a:Name>
18478 18490 
 <a:Code>payment_name</a:Code>
 
@@ -18484,7 +18496,7 @@ LABL 0 新宋体,8,N</a:FontList>
18484 18496 
 <a:DataType>varchar(255)</a:DataType>
18485 18497 
 <a:Length>255</a:Length>
18486 18498 
 </o:Column>
18487 
-<o:Column Id="o1094">
18499 
+<o:Column Id="o1095">
18488 18500 
 <a:ObjectID>2C17C691-0E31-4CD5-A8A7-5D326BB722F7</a:ObjectID>
18489 18501 
 <a:Name>payment_type</a:Name>
18490 18502 
 <a:Code>payment_type</a:Code>
 
@@ -18496,7 +18508,7 @@ LABL 0 新宋体,8,N</a:FontList>
18496 18508 
 <a:DataType>varchar(2)</a:DataType>
18497 18509 
 <a:Length>2</a:Length>
18498 18510 
 </o:Column>
18499 
-<o:Column Id="o1095">
18511 
+<o:Column Id="o1096">
18500 18512 
 <a:ObjectID>431D00B1-22B7-4183-9E3C-8DC9222B68A9</a:ObjectID>
18501 18513 
 <a:Name>expire_date</a:Name>
18502 18514 
 <a:Code>expire_date</a:Code>
 
@@ -18507,7 +18519,7 @@ LABL 0 新宋体,8,N</a:FontList>
18507 18519 
 <a:Comment>到期时间</a:Comment>
18508 18520 
 <a:DataType>datetime</a:DataType>
18509 18521 
 </o:Column>
18510 
-<o:Column Id="o1096">
18522 
+<o:Column Id="o1097">
18511 18523 
 <a:ObjectID>9D078A47-1407-4881-9BAC-287FC15BBEB6</a:ObjectID>
18512 18524 
 <a:Name>unit_price</a:Name>
18513 18525 
 <a:Code>unit_price</a:Code>
 
@@ -18519,7 +18531,7 @@ LABL 0 新宋体,8,N</a:FontList>
18519 18531 
 <a:DataType>varchar(255)</a:DataType>
18520 18532 
 <a:Length>255</a:Length>
18521 18533 
 </o:Column>
18522 
-<o:Column Id="o1097">
18534 
+<o:Column Id="o1098">
18523 18535 
 <a:ObjectID>F78B78EC-E859-47C1-AC9D-A3E1B0CBA926</a:ObjectID>
18524 18536 
 <a:Name>parking_lot</a:Name>
18525 18537 
 <a:Code>parking_lot</a:Code>
 
@@ -18531,7 +18543,7 @@ LABL 0 新宋体,8,N</a:FontList>
18531 18543 
 <a:DataType>varchar(255)</a:DataType>
18532 18544 
 <a:Length>255</a:Length>
18533 18545 
 </o:Column>
18534 
-<o:Column Id="o1098">
18546 
+<o:Column Id="o1099">
18535 18547 
 <a:ObjectID>9273BE9C-B9DC-4C92-AA4D-018829225523</a:ObjectID>
18536 18548 
 <a:Name>license_plate</a:Name>
18537 18549 
 <a:Code>license_plate</a:Code>
 
@@ -18545,7 +18557,7 @@ LABL 0 新宋体,8,N</a:FontList>
18545 18557 
 </o:Column>
18546 18558 
 </c:Columns>
18547 18559 
 <c:Keys>
18548 
-<o:Key Id="o1099">
18560 
+<o:Key Id="o1100">
18549 18561 
 <a:ObjectID>F57D4E18-1528-44BD-BEBB-4680F3D77BDA</a:ObjectID>
18550 18562 
 <a:Name>Key_1</a:Name>
18551 18563 
 <a:Code>Key_1</a:Code>
 
@@ -18554,12 +18566,12 @@ LABL 0 新宋体,8,N</a:FontList>
18554 18566 
 <a:ModificationDate>1557372945</a:ModificationDate>
18555 18567 
 <a:Modifier>szc</a:Modifier>
18556 18568 
 <c:Key.Columns>
18557 
-<o:Column Ref="o1081"/>
18569 
+<o:Column Ref="o1082"/>
18558 18570 
 </c:Key.Columns>
18559 18571 
 </o:Key>
18560 18572 
 </c:Keys>
18561 18573 
 <c:PrimaryKey>
18562 
-<o:Key Ref="o1099"/>
18574 
+<o:Key Ref="o1100"/>
18563 18575 
 </c:PrimaryKey>
18564 18576 
 </o:Table>
18565 18577 
 <o:Table Id="o259">
 
@@ -18568,12 +18580,12 @@ LABL 0 新宋体,8,N</a:FontList>
18568 18580 
 <a:Code>ta_version</a:Code>
18569 18581 
 <a:CreationDate>1557800506</a:CreationDate>
18570 18582 
 <a:Creator>szc</a:Creator>
18571 
-<a:ModificationDate>1557800706</a:ModificationDate>
18583 
+<a:ModificationDate>1557800793</a:ModificationDate>
18572 18584 
 <a:Modifier>szc</a:Modifier>
18573 18585 
 <a:Comment>app端版本号</a:Comment>
18574 18586 
 <a:TotalSavingCurrency/>
18575 18587 
 <c:Columns>
18576 
-<o:Column Id="o1100">
18588 
+<o:Column Id="o1101">
18577 18589 
 <a:ObjectID>A9874095-1A7A-41B3-BDAA-89FF219B226F</a:ObjectID>
18578 18590 
 <a:Name>id</a:Name>
18579 18591 
 <a:Code>id</a:Code>
 
@@ -18585,7 +18597,7 @@ LABL 0 新宋体,8,N</a:FontList>
18585 18597 
 <a:Length>11</a:Length>
18586 18598 
 <a:Column.Mandatory>1</a:Column.Mandatory>
18587 18599 
 </o:Column>
18588 
-<o:Column Id="o1101">
18600 
+<o:Column Id="o1102">
18589 18601 
 <a:ObjectID>946CB4DD-6B85-465A-895E-5E8A8F2BA7C3</a:ObjectID>
18590 18602 
 <a:Name>client_version</a:Name>
18591 18603 
 <a:Code>client_version</a:Code>
 
@@ -18597,7 +18609,7 @@ LABL 0 新宋体,8,N</a:FontList>
18597 18609 
 <a:DataType>varchar(255)</a:DataType>
18598 18610 
 <a:Length>255</a:Length>
18599 18611 
 </o:Column>
18600 
-<o:Column Id="o1102">
18612 
+<o:Column Id="o1103">
18601 18613 
 <a:ObjectID>BDFD3026-FC17-4D03-A503-7AF3A37592A5</a:ObjectID>
18602 18614 
 <a:Name>service_version</a:Name>
18603 18615 
 <a:Code>service_version</a:Code>
 
@@ -18609,7 +18621,7 @@ LABL 0 新宋体,8,N</a:FontList>
18609 18621 
 <a:DataType>varchar(255)</a:DataType>
18610 18622 
 <a:Length>255</a:Length>
18611 18623 
 </o:Column>
18612 
-<o:Column Id="o1103">
18624 
+<o:Column Id="o1104">
18613 18625 
 <a:ObjectID>3D77C63D-552E-4815-8BBB-148013A10319</a:ObjectID>
18614 18626 
 <a:Name>type</a:Name>
18615 18627 
 <a:Code>type</a:Code>
 
@@ -18621,9 +18633,21 @@ LABL 0 新宋体,8,N</a:FontList>
18621 18633 
 <a:DataType>varchar(255)</a:DataType>
18622 18634 
 <a:Length>255</a:Length>
18623 18635 
 </o:Column>
18636 
+<o:Column Id="o1105">
18637 
+<a:ObjectID>1414BD13-AA8D-4144-BA19-810AED96EE55</a:ObjectID>
18638 
+<a:Name>update_address</a:Name>
18639 
+<a:Code>update_address</a:Code>
18640 
+<a:CreationDate>1557800748</a:CreationDate>
18641 
+<a:Creator>szc</a:Creator>
18642 
+<a:ModificationDate>1557800793</a:ModificationDate>
18643 
+<a:Modifier>szc</a:Modifier>
18644 
+<a:Comment>升级地址</a:Comment>
18645 
+<a:DataType>varchar(255)</a:DataType>
18646 
+<a:Length>255</a:Length>
18647 
+</o:Column>
18624 18648 
 </c:Columns>
18625 18649 
 <c:Keys>
18626 
-<o:Key Id="o1104">
18650 
+<o:Key Id="o1106">
18627 18651 
 <a:ObjectID>81BA3F75-E9E6-4FF0-BC41-4D8BAF735EDC</a:ObjectID>
18628 18652 
 <a:Name>Key_1</a:Name>
18629 18653 
 <a:Code>Key_1</a:Code>
 
@@ -18632,17 +18656,17 @@ LABL 0 新宋体,8,N</a:FontList>
18632 18656 
 <a:ModificationDate>1557800616</a:ModificationDate>
18633 18657 
 <a:Modifier>szc</a:Modifier>
18634 18658 
 <c:Key.Columns>
18635 
-<o:Column Ref="o1100"/>
18659 
+<o:Column Ref="o1101"/>
18636 18660 
 </c:Key.Columns>
18637 18661 
 </o:Key>
18638 18662 
 </c:Keys>
18639 18663 
 <c:PrimaryKey>
18640 
-<o:Key Ref="o1104"/>
18664 
+<o:Key Ref="o1106"/>
18641 18665 
 </c:PrimaryKey>
18642 18666 
 </o:Table>
18643 18667 
 </c:Tables>
18644 18668 
 <c:DefaultGroups>
18645 
-<o:Group Id="o1105">
18669 
+<o:Group Id="o1107">
18646 18670 
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
18647 18671 
 <a:Name>PUBLIC</a:Name>
18648 18672 
 <a:Code>PUBLIC</a:Code>
 
@@ -19305,7 +19329,7 @@ LABL 0 新宋体,8,N</a:FontList>
19305 19329 
 </o:ExtendedDependency>
19306 19330 
 </c:ChildTraceabilityLinks>
19307 19331 
 <c:TargetModels>
19308 
-<o:TargetModel Id="o1106">
19332 
+<o:TargetModel Id="o1108">
19309 19333 
 <a:ObjectID>B86EB932-C352-4174-86E4-2D2B1DDE4A45</a:ObjectID>
19310 19334 
 <a:Name>MySQL 5.0</a:Name>
19311 19335 
 <a:Code>MYSQL50</a:Code>

+ 124
- 100
文档/MYSQL/smartCommunity.pdm 파일 보기 

@@ -1,5 +1,5 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<?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"?>
2 
+<?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"?>
3 3 
 <!-- do not edit this file -->
4 4
5 5 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
 
@@ -6979,7 +6979,7 @@ LABL 0 新宋体,8,N</a:FontList>
6979 6979 
 <a:CreationDate>1557303510</a:CreationDate>
6980 6980 
 <a:ModificationDate>1557306066</a:ModificationDate>
6981 6981 
 <a:IconMode>-1</a:IconMode>
6982 
-<a:Rect>((187327,19260), (204115,48658))</a:Rect>
6982 
+<a:Rect>((187327,18360), (204115,49558))</a:Rect>
6983 6983 
 <a:LineColor>12615680</a:LineColor>
6984 6984 
 <a:FillColor>16570034</a:FillColor>
6985 6985 
 <a:ShadowColor>12632256</a:ShadowColor>
 
@@ -17524,7 +17524,7 @@ LABL 0 新宋体,8,N</a:FontList>
17524 17524 
 <a:Code>tp_rental_house</a:Code>
17525 17525 
 <a:CreationDate>1557303510</a:CreationDate>
17526 17526 
 <a:Creator>szc</a:Creator>
17527 
-<a:ModificationDate>1557307546</a:ModificationDate>
17527 
+<a:ModificationDate>1557818754</a:ModificationDate>
17528 17528 
 <a:Modifier>szc</a:Modifier>
17529 17529 
 <a:Comment>出租公寓表</a:Comment>
17530 17530 
 <a:TotalSavingCurrency/>
 
@@ -17543,6 +17543,18 @@ LABL 0 新宋体,8,N</a:FontList>
17543 17543 
 <a:Column.Mandatory>1</a:Column.Mandatory>
17544 17544 
 </o:Column>
17545 17545 
 <o:Column Id="o1021">
17546 
+<a:ObjectID>8AE70562-18C0-45C6-BF15-FCAA422F59C2</a:ObjectID>
17547 
+<a:Name>community_id</a:Name>
17548 
+<a:Code>community_id</a:Code>
17549 
+<a:CreationDate>1557813774</a:CreationDate>
17550 
+<a:Creator>szc</a:Creator>
17551 
+<a:ModificationDate>1557813818</a:ModificationDate>
17552 
+<a:Modifier>szc</a:Modifier>
17553 
+<a:Comment>我们系统的小区ID</a:Comment>
17554 
+<a:DataType>int(11)</a:DataType>
17555 
+<a:Length>11</a:Length>
17556 
+</o:Column>
17557 
+<o:Column Id="o1022">
17546 17558 
 <a:ObjectID>51C7C13C-E338-45B0-A4E6-3F88B2DE7F33</a:ObjectID>
17547 17559 
 <a:Name>house_name</a:Name>
17548 17560 
 <a:Code>house_name</a:Code>
 
@@ -17554,7 +17566,7 @@ LABL 0 新宋体,8,N</a:FontList>
17554 17566 
 <a:DataType>varchar(255)</a:DataType>
17555 17567 
 <a:Length>255</a:Length>
17556 17568 
 </o:Column>
17557 
-<o:Column Id="o1022">
17569 
+<o:Column Id="o1023">
17558 17570 
 <a:ObjectID>CB9AD670-AD18-4424-9385-AB1105DCE3CB</a:ObjectID>
17559 17571 
 <a:Name>rental_price</a:Name>
17560 17572 
 <a:Code>rental_price</a:Code>
 
@@ -17566,7 +17578,7 @@ LABL 0 新宋体,8,N</a:FontList>
17566 17578 
 <a:DataType>varchar(255)</a:DataType>
17567 17579 
 <a:Length>255</a:Length>
17568 17580 
 </o:Column>
17569 
-<o:Column Id="o1023">
17581 
+<o:Column Id="o1024">
17570 17582 
 <a:ObjectID>2D4C03FA-18B3-4835-A768-0BF06B6674B2</a:ObjectID>
17571 17583 
 <a:Name>area</a:Name>
17572 17584 
 <a:Code>area</a:Code>
 
@@ -17578,7 +17590,7 @@ LABL 0 新宋体,8,N</a:FontList>
17578 17590 
 <a:DataType>varchar(255)</a:DataType>
17579 17591 
 <a:Length>255</a:Length>
17580 17592 
 </o:Column>
17581 
-<o:Column Id="o1024">
17593 
+<o:Column Id="o1025">
17582 17594 
 <a:ObjectID>DE4B7575-2E0F-4439-BB2E-7B293918BCFF</a:ObjectID>
17583 17595 
 <a:Name>rental_type</a:Name>
17584 17596 
 <a:Code>rental_type</a:Code>
 
@@ -17590,7 +17602,7 @@ LABL 0 新宋体,8,N</a:FontList>
17590 17602 
 <a:DataType>varchar(255)</a:DataType>
17591 17603 
 <a:Length>255</a:Length>
17592 17604 
 </o:Column>
17593 
-<o:Column Id="o1025">
17605 
+<o:Column Id="o1026">
17594 17606 
 <a:ObjectID>09D9CD83-643E-407F-B521-D0B808271727</a:ObjectID>
17595 17607 
 <a:Name>house_type</a:Name>
17596 17608 
 <a:Code>house_type</a:Code>
 
@@ -17602,7 +17614,7 @@ LABL 0 新宋体,8,N</a:FontList>
17602 17614 
 <a:DataType>varchar(255)</a:DataType>
17603 17615 
 <a:Length>255</a:Length>
17604 17616 
 </o:Column>
17605 
-<o:Column Id="o1026">
17617 
+<o:Column Id="o1027">
17606 17618 
 <a:ObjectID>CF14CF64-1763-4792-8D75-D010840925A8</a:ObjectID>
17607 17619 
 <a:Name>house_status</a:Name>
17608 17620 
 <a:Code>house_status</a:Code>
 
@@ -17614,7 +17626,7 @@ LABL 0 新宋体,8,N</a:FontList>
17614 17626 
 <a:DataType>varchar(255)</a:DataType>
17615 17627 
 <a:Length>255</a:Length>
17616 17628 
 </o:Column>
17617 
-<o:Column Id="o1027">
17629 
+<o:Column Id="o1028">
17618 17630 
 <a:ObjectID>F676264A-1683-4D62-BBB4-F18F705B4C63</a:ObjectID>
17619 17631 
 <a:Name>house_level</a:Name>
17620 17632 
 <a:Code>house_level</a:Code>
 
@@ -17626,7 +17638,7 @@ LABL 0 新宋体,8,N</a:FontList>
17626 17638 
 <a:DataType>varchar(255)</a:DataType>
17627 17639 
 <a:Length>255</a:Length>
17628 17640 
 </o:Column>
17629 
-<o:Column Id="o1028">
17641 
+<o:Column Id="o1029">
17630 17642 
 <a:ObjectID>D56459F7-EC5C-4508-84C0-4BBEF2ADA53D</a:ObjectID>
17631 17643 
 <a:Name>house_label</a:Name>
17632 17644 
 <a:Code>house_label</a:Code>
 
@@ -17638,7 +17650,7 @@ LABL 0 新宋体,8,N</a:FontList>
17638 17650 
 <a:DataType>varchar(255)</a:DataType>
17639 17651 
 <a:Length>255</a:Length>
17640 17652 
 </o:Column>
17641 
-<o:Column Id="o1029">
17653 
+<o:Column Id="o1030">
17642 17654 
 <a:ObjectID>C9B94A82-C5AA-4826-9909-E564BF1B5E0A</a:ObjectID>
17643 17655 
 <a:Name>sort</a:Name>
17644 17656 
 <a:Code>sort</a:Code>
 
@@ -17650,7 +17662,7 @@ LABL 0 新宋体,8,N</a:FontList>
17650 17662 
 <a:DataType>int(11)</a:DataType>
17651 17663 
 <a:Length>11</a:Length>
17652 17664 
 </o:Column>
17653 
-<o:Column Id="o1030">
17665 
+<o:Column Id="o1031">
17654 17666 
 <a:ObjectID>9B121749-83C8-4367-8A35-1D05D64102B1</a:ObjectID>
17655 17667 
 <a:Name>house_tel</a:Name>
17656 17668 
 <a:Code>house_tel</a:Code>
 
@@ -17662,7 +17674,7 @@ LABL 0 新宋体,8,N</a:FontList>
17662 17674 
 <a:DataType>varchar(255)</a:DataType>
17663 17675 
 <a:Length>255</a:Length>
17664 17676 
 </o:Column>
17665 
-<o:Column Id="o1031">
17677 
+<o:Column Id="o1032">
17666 17678 
 <a:ObjectID>FE137449-0BEF-4A20-AC8F-475CA8BF4F2E</a:ObjectID>
17667 17679 
 <a:Name>community_address</a:Name>
17668 17680 
 <a:Code>community_address</a:Code>
 
@@ -17674,7 +17686,7 @@ LABL 0 新宋体,8,N</a:FontList>
17674 17686 
 <a:DataType>varchar(255)</a:DataType>
17675 17687 
 <a:Length>255</a:Length>
17676 17688 
 </o:Column>
17677 
-<o:Column Id="o1032">
17689 
+<o:Column Id="o1033">
17678 17690 
 <a:ObjectID>34B0089B-9EA6-436B-B236-B087A3CE73E5</a:ObjectID>
17679 17691 
 <a:Name>community_longitude</a:Name>
17680 17692 
 <a:Code>community_longitude</a:Code>
 
@@ -17686,7 +17698,7 @@ LABL 0 新宋体,8,N</a:FontList>
17686 17698 
 <a:DataType>varchar(255)</a:DataType>
17687 17699 
 <a:Length>255</a:Length>
17688 17700 
 </o:Column>
17689 
-<o:Column Id="o1033">
17701 
+<o:Column Id="o1034">
17690 17702 
 <a:ObjectID>A62ABB38-54CD-4F47-8C17-D1A9342DD8FC</a:ObjectID>
17691 17703 
 <a:Name>community_latitude</a:Name>
17692 17704 
 <a:Code>community_latitude</a:Code>
 
@@ -17698,7 +17710,7 @@ LABL 0 新宋体,8,N</a:FontList>
17698 17710 
 <a:DataType>varchar(255)</a:DataType>
17699 17711 
 <a:Length>255</a:Length>
17700 17712 
 </o:Column>
17701 
-<o:Column Id="o1034">
17713 
+<o:Column Id="o1035">
17702 17714 
 <a:ObjectID>1E5C86EA-7B19-497D-BDDE-96EA66DF905F</a:ObjectID>
17703 17715 
 <a:Name>house_introduction</a:Name>
17704 17716 
 <a:Code>house_introduction</a:Code>
 
@@ -17709,7 +17721,7 @@ LABL 0 新宋体,8,N</a:FontList>
17709 17721 
 <a:Comment>房屋介绍</a:Comment>
17710 17722 
 <a:DataType>text</a:DataType>
17711 17723 
 </o:Column>
17712 
-<o:Column Id="o1035">
17724 
+<o:Column Id="o1036">
17713 17725 
 <a:ObjectID>C505FCE6-7EF3-4451-8A34-0A61EC7FE8E0</a:ObjectID>
17714 17726 
 <a:Name>bed</a:Name>
17715 17727 
 <a:Code>bed</a:Code>
 
@@ -17721,7 +17733,19 @@ LABL 0 新宋体,8,N</a:FontList>
17721 17733 
 <a:DataType>varchar(1)</a:DataType>
17722 17734 
 <a:Length>1</a:Length>
17723 17735 
 </o:Column>
17724 
-<o:Column Id="o1036">
17736 
+<o:Column Id="o1037">
17737 
+<a:ObjectID>42F73021-2A57-4614-B1A8-3C713A84F54D</a:ObjectID>
17738 
+<a:Name>mattress</a:Name>
17739 
+<a:Code>mattress</a:Code>
17740 
+<a:CreationDate>1557818735</a:CreationDate>
17741 
+<a:Creator>szc</a:Creator>
17742 
+<a:ModificationDate>1557818754</a:ModificationDate>
17743 
+<a:Modifier>szc</a:Modifier>
17744 
+<a:Comment>床垫 1 有</a:Comment>
17745 
+<a:DataType>varchar(1)</a:DataType>
17746 
+<a:Length>1</a:Length>
17747 
+</o:Column>
17748 
+<o:Column Id="o1038">
17725 17749 
 <a:ObjectID>86AC4B40-FEBD-4FCB-A079-23ED794287E7</a:ObjectID>
17726 17750 
 <a:Name>wardrobe</a:Name>
17727 17751 
 <a:Code>wardrobe</a:Code>
 
@@ -17733,7 +17757,7 @@ LABL 0 新宋体,8,N</a:FontList>
17733 17757 
 <a:DataType>varchar(1)</a:DataType>
17734 17758 
 <a:Length>1</a:Length>
17735 17759 
 </o:Column>
17736 
-<o:Column Id="o1037">
17760 
+<o:Column Id="o1039">
17737 17761 
 <a:ObjectID>0F598383-042D-42FD-B7DD-5EAD70E46C1B</a:ObjectID>
17738 17762 
 <a:Name>dining_table</a:Name>
17739 17763 
 <a:Code>dining_table</a:Code>
 
@@ -17745,7 +17769,7 @@ LABL 0 新宋体,8,N</a:FontList>
17745 17769 
 <a:DataType>varchar(1)</a:DataType>
17746 17770 
 <a:Length>1</a:Length>
17747 17771 
 </o:Column>
17748 
-<o:Column Id="o1038">
17772 
+<o:Column Id="o1040">
17749 17773 
 <a:ObjectID>7FB29743-6F55-4ADD-829C-886CD8235B78</a:ObjectID>
17750 17774 
 <a:Name>computer_desk</a:Name>
17751 17775 
 <a:Code>computer_desk</a:Code>
 
@@ -17757,7 +17781,7 @@ LABL 0 新宋体,8,N</a:FontList>
17757 17781 
 <a:DataType>varchar(1)</a:DataType>
17758 17782 
 <a:Length>1</a:Length>
17759 17783 
 </o:Column>
17760 
-<o:Column Id="o1039">
17784 
+<o:Column Id="o1041">
17761 17785 
 <a:ObjectID>BD673A93-F61B-4C96-BEAD-2283ACDFAF64</a:ObjectID>
17762 17786 
 <a:Name>water_heater</a:Name>
17763 17787 
 <a:Code>water_heater</a:Code>
 
@@ -17769,7 +17793,7 @@ LABL 0 新宋体,8,N</a:FontList>
17769 17793 
 <a:DataType>varchar(1)</a:DataType>
17770 17794 
 <a:Length>1</a:Length>
17771 17795 
 </o:Column>
17772 
-<o:Column Id="o1040">
17796 
+<o:Column Id="o1042">
17773 17797 
 <a:ObjectID>4F881349-E1A5-4DE0-8010-BC61A8DF88A3</a:ObjectID>
17774 17798 
 <a:Name>chair</a:Name>
17775 17799 
 <a:Code>chair</a:Code>
 
@@ -17781,7 +17805,7 @@ LABL 0 新宋体,8,N</a:FontList>
17781 17805 
 <a:DataType>varchar(1)</a:DataType>
17782 17806 
 <a:Length>1</a:Length>
17783 17807 
 </o:Column>
17784 
-<o:Column Id="o1041">
17808 
+<o:Column Id="o1043">
17785 17809 
 <a:ObjectID>95D69A16-BEA6-4D93-AE71-BD1F110A4B26</a:ObjectID>
17786 17810 
 <a:Name>washing_machine</a:Name>
17787 17811 
 <a:Code>washing_machine</a:Code>
 
@@ -17793,7 +17817,7 @@ LABL 0 新宋体,8,N</a:FontList>
17793 17817 
 <a:DataType>varchar(1)</a:DataType>
17794 17818 
 <a:Length>1</a:Length>
17795 17819 
 </o:Column>
17796 
-<o:Column Id="o1042">
17820 
+<o:Column Id="o1044">
17797 17821 
 <a:ObjectID>DD7E6C40-AD47-4864-AFFB-FBB0E8D9121B</a:ObjectID>
17798 17822 
 <a:Name>air_conditioning</a:Name>
17799 17823 
 <a:Code>air_conditioning</a:Code>
 
@@ -17805,7 +17829,7 @@ LABL 0 新宋体,8,N</a:FontList>
17805 17829 
 <a:DataType>varchar(1)</a:DataType>
17806 17830 
 <a:Length>1</a:Length>
17807 17831 
 </o:Column>
17808 
-<o:Column Id="o1043">
17832 
+<o:Column Id="o1045">
17809 17833 
 <a:ObjectID>8F69DF57-D61E-47AB-8E05-BB0EBB0B5139</a:ObjectID>
17810 17834 
 <a:Name>table_lamp</a:Name>
17811 17835 
 <a:Code>table_lamp</a:Code>
 
@@ -17817,7 +17841,7 @@ LABL 0 新宋体,8,N</a:FontList>
17817 17841 
 <a:DataType>varchar(1)</a:DataType>
17818 17842 
 <a:Length>1</a:Length>
17819 17843 
 </o:Column>
17820 
-<o:Column Id="o1044">
17844 
+<o:Column Id="o1046">
17821 17845 
 <a:ObjectID>0A425DF5-5766-4069-BD6E-771C1676BB85</a:ObjectID>
17822 17846 
 <a:Name>WiFi</a:Name>
17823 17847 
 <a:Code>WiFi</a:Code>
 
@@ -17829,7 +17853,7 @@ LABL 0 新宋体,8,N</a:FontList>
17829 17853 
 <a:DataType>varchar(1)</a:DataType>
17830 17854 
 <a:Length>1</a:Length>
17831 17855 
 </o:Column>
17832 
-<o:Column Id="o1045">
17856 
+<o:Column Id="o1047">
17833 17857 
 <a:ObjectID>5CA481DC-A4C9-4723-B1E5-43F84387D203</a:ObjectID>
17834 17858 
 <a:Name>microwave_oven</a:Name>
17835 17859 
 <a:Code>microwave_oven</a:Code>
 
@@ -17841,7 +17865,7 @@ LABL 0 新宋体,8,N</a:FontList>
17841 17865 
 <a:DataType>varchar(1)</a:DataType>
17842 17866 
 <a:Length>1</a:Length>
17843 17867 
 </o:Column>
17844 
-<o:Column Id="o1046">
17868 
+<o:Column Id="o1048">
17845 17869 
 <a:ObjectID>8100898B-1949-4F10-B73D-47B3D94A8826</a:ObjectID>
17846 17870 
 <a:Name>natural_gas</a:Name>
17847 17871 
 <a:Code>natural_gas</a:Code>
 
@@ -17853,7 +17877,7 @@ LABL 0 新宋体,8,N</a:FontList>
17853 17877 
 <a:DataType>varchar(1)</a:DataType>
17854 17878 
 <a:Length>1</a:Length>
17855 17879 
 </o:Column>
17856 
-<o:Column Id="o1047">
17880 
+<o:Column Id="o1049">
17857 17881 
 <a:ObjectID>86966D69-2983-4EEE-B469-B2630F47E55E</a:ObjectID>
17858 17882 
 <a:Name>create_date</a:Name>
17859 17883 
 <a:Code>create_date</a:Code>
 
@@ -17864,7 +17888,7 @@ LABL 0 新宋体,8,N</a:FontList>
17864 17888 
 <a:Comment>创建时间</a:Comment>
17865 17889 
 <a:DataType>datetime</a:DataType>
17866 17890 
 </o:Column>
17867 
-<o:Column Id="o1048">
17891 
+<o:Column Id="o1050">
17868 17892 
 <a:ObjectID>0E612C68-BF9C-4454-889C-68B6A3CAF9CB</a:ObjectID>
17869 17893 
 <a:Name>create_user</a:Name>
17870 17894 
 <a:Code>create_user</a:Code>
 
@@ -17876,7 +17900,7 @@ LABL 0 新宋体,8,N</a:FontList>
17876 17900 
 <a:DataType>int(11)</a:DataType>
17877 17901 
 <a:Length>11</a:Length>
17878 17902 
 </o:Column>
17879 
-<o:Column Id="o1049">
17903 
+<o:Column Id="o1051">
17880 17904 
 <a:ObjectID>44888D0B-ED44-4152-A948-FE2738CD4730</a:ObjectID>
17881 17905 
 <a:Name>update_date</a:Name>
17882 17906 
 <a:Code>update_date</a:Code>
 
@@ -17887,7 +17911,7 @@ LABL 0 新宋体,8,N</a:FontList>
17887 17911 
 <a:Comment>更新时间</a:Comment>
17888 17912 
 <a:DataType>datetime</a:DataType>
17889 17913 
 </o:Column>
17890 
-<o:Column Id="o1050">
17914 
+<o:Column Id="o1052">
17891 17915 
 <a:ObjectID>9ACA9B2C-9A46-43EC-AB23-5DD83CED5EF2</a:ObjectID>
17892 17916 
 <a:Name>update_user</a:Name>
17893 17917 
 <a:Code>update_user</a:Code>
 
@@ -17901,7 +17925,7 @@ LABL 0 新宋体,8,N</a:FontList>
17901 17925 
 </o:Column>
17902 17926 
 </c:Columns>
17903 17927 
 <c:Keys>
17904 
-<o:Key Id="o1051">
17928 
+<o:Key Id="o1053">
17905 17929 
 <a:ObjectID>148EAD21-CFA4-42E6-9F44-C31E1C508685</a:ObjectID>
17906 17930 
 <a:Name>Key_1</a:Name>
17907 17931 
 <a:Code>Key_1</a:Code>
 
@@ -17915,7 +17939,7 @@ LABL 0 新宋体,8,N</a:FontList>
17915 17939 
 </o:Key>
17916 17940 
 </c:Keys>
17917 17941 
 <c:PrimaryKey>
17918 
-<o:Key Ref="o1051"/>
17942 
+<o:Key Ref="o1053"/>
17919 17943 
 </c:PrimaryKey>
17920 17944 
 </o:Table>
17921 17945 
 <o:Table Id="o253">
 
@@ -17929,7 +17953,7 @@ LABL 0 新宋体,8,N</a:FontList>
17929 17953 
 <a:Comment>商铺图片</a:Comment>
17930 17954 
 <a:TotalSavingCurrency/>
17931 17955 
 <c:Columns>
17932 
-<o:Column Id="o1052">
17956 
+<o:Column Id="o1054">
17933 17957 
 <a:ObjectID>92BB3B4E-28C8-452C-B070-4A0755DE3BBC</a:ObjectID>
17934 17958 
 <a:Name>id</a:Name>
17935 17959 
 <a:Code>id</a:Code>
 
@@ -17942,7 +17966,7 @@ LABL 0 新宋体,8,N</a:FontList>
17942 17966 
 <a:Identity>1</a:Identity>
17943 17967 
 <a:Column.Mandatory>1</a:Column.Mandatory>
17944 17968 
 </o:Column>
17945 
-<o:Column Id="o1053">
17969 
+<o:Column Id="o1055">
17946 17970 
 <a:ObjectID>21087CE1-7882-4A27-ACD7-E1579649B207</a:ObjectID>
17947 17971 
 <a:Name>community_id</a:Name>
17948 17972 
 <a:Code>community_id</a:Code>
 
@@ -17954,7 +17978,7 @@ LABL 0 新宋体,8,N</a:FontList>
17954 17978 
 <a:DataType>int(11)</a:DataType>
17955 17979 
 <a:Length>11</a:Length>
17956 17980 
 </o:Column>
17957 
-<o:Column Id="o1054">
17981 
+<o:Column Id="o1056">
17958 17982 
 <a:ObjectID>6B2B261C-902C-41CE-848E-FF27C66FE85B</a:ObjectID>
17959 17983 
 <a:Name>shop_id</a:Name>
17960 17984 
 <a:Code>shop_id</a:Code>
 
@@ -17966,7 +17990,7 @@ LABL 0 新宋体,8,N</a:FontList>
17966 17990 
 <a:DataType>int(11)</a:DataType>
17967 17991 
 <a:Length>11</a:Length>
17968 17992 
 </o:Column>
17969 
-<o:Column Id="o1055">
17993 
+<o:Column Id="o1057">
17970 17994 
 <a:ObjectID>1903CA52-9255-47A8-9B59-B8CA06D703E0</a:ObjectID>
17971 17995 
 <a:Name>img_url</a:Name>
17972 17996 
 <a:Code>img_url</a:Code>
 
@@ -17978,7 +18002,7 @@ LABL 0 新宋体,8,N</a:FontList>
17978 18002 
 <a:DataType>varchar(255)</a:DataType>
17979 18003 
 <a:Length>255</a:Length>
17980 18004 
 </o:Column>
17981 
-<o:Column Id="o1056">
18005 
+<o:Column Id="o1058">
17982 18006 
 <a:ObjectID>D12DC8AD-CF58-4DE5-A9DC-ABB63D349D13</a:ObjectID>
17983 18007 
 <a:Name>img_type</a:Name>
17984 18008 
 <a:Code>img_type</a:Code>
 
@@ -17990,7 +18014,7 @@ LABL 0 新宋体,8,N</a:FontList>
17990 18014 
 <a:DataType>varchar(2)</a:DataType>
17991 18015 
 <a:Length>2</a:Length>
17992 18016 
 </o:Column>
17993 
-<o:Column Id="o1057">
18017 
+<o:Column Id="o1059">
17994 18018 
 <a:ObjectID>5BC7B1D6-E34E-4473-9DF1-CA6240B1C23F</a:ObjectID>
17995 18019 
 <a:Name>create_date</a:Name>
17996 18020 
 <a:Code>create_date</a:Code>
 
@@ -18003,7 +18027,7 @@ LABL 0 新宋体,8,N</a:FontList>
18003 18027 
 </o:Column>
18004 18028 
 </c:Columns>
18005 18029 
 <c:Keys>
18006 
-<o:Key Id="o1058">
18030 
+<o:Key Id="o1060">
18007 18031 
 <a:ObjectID>6EEDA542-1E85-47A3-BC57-7C65558D93D0</a:ObjectID>
18008 18032 
 <a:Name>Key_1</a:Name>
18009 18033 
 <a:Code>Key_1</a:Code>
 
@@ -18012,12 +18036,12 @@ LABL 0 新宋体,8,N</a:FontList>
18012 18036 
 <a:ModificationDate>1557304098</a:ModificationDate>
18013 18037 
 <a:Modifier>szc</a:Modifier>
18014 18038 
 <c:Key.Columns>
18015 
-<o:Column Ref="o1052"/>
18039 
+<o:Column Ref="o1054"/>
18016 18040 
 </c:Key.Columns>
18017 18041 
 </o:Key>
18018 18042 
 </c:Keys>
18019 18043 
 <c:PrimaryKey>
18020 
-<o:Key Ref="o1058"/>
18044 
+<o:Key Ref="o1060"/>
18021 18045 
 </c:PrimaryKey>
18022 18046 
 </o:Table>
18023 18047 
 <o:Table Id="o255">
 
@@ -18031,7 +18055,7 @@ LABL 0 新宋体,8,N</a:FontList>
18031 18055 
 <a:Comment>出租房间图片</a:Comment>
18032 18056 
 <a:TotalSavingCurrency/>
18033 18057 
 <c:Columns>
18034 
-<o:Column Id="o1059">
18058 
+<o:Column Id="o1061">
18035 18059 
 <a:ObjectID>98ED7313-E915-44A1-9D4F-80F5BC057C88</a:ObjectID>
18036 18060 
 <a:Name>id</a:Name>
18037 18061 
 <a:Code>id</a:Code>
 
@@ -18044,7 +18068,7 @@ LABL 0 新宋体,8,N</a:FontList>
18044 18068 
 <a:Identity>1</a:Identity>
18045 18069 
 <a:Column.Mandatory>1</a:Column.Mandatory>
18046 18070 
 </o:Column>
18047 
-<o:Column Id="o1060">
18071 
+<o:Column Id="o1062">
18048 18072 
 <a:ObjectID>C9DD2C07-B914-4F63-AFCD-05FA9EEC9184</a:ObjectID>
18049 18073 
 <a:Name>community_id</a:Name>
18050 18074 
 <a:Code>community_id</a:Code>
 
@@ -18056,7 +18080,7 @@ LABL 0 新宋体,8,N</a:FontList>
18056 18080 
 <a:DataType>int(11)</a:DataType>
18057 18081 
 <a:Length>11</a:Length>
18058 18082 
 </o:Column>
18059 
-<o:Column Id="o1061">
18083 
+<o:Column Id="o1063">
18060 18084 
 <a:ObjectID>B557681C-3BC2-492A-9313-38454B3D480A</a:ObjectID>
18061 18085 
 <a:Name>rental_house_id</a:Name>
18062 18086 
 <a:Code>rental_house_id</a:Code>
 
@@ -18068,7 +18092,7 @@ LABL 0 新宋体,8,N</a:FontList>
18068 18092 
 <a:DataType>int(11)</a:DataType>
18069 18093 
 <a:Length>11</a:Length>
18070 18094 
 </o:Column>
18071 
-<o:Column Id="o1062">
18095 
+<o:Column Id="o1064">
18072 18096 
 <a:ObjectID>7EFF853D-17E5-459D-8942-60286B8BF991</a:ObjectID>
18073 18097 
 <a:Name>img_url</a:Name>
18074 18098 
 <a:Code>img_url</a:Code>
 
@@ -18080,7 +18104,7 @@ LABL 0 新宋体,8,N</a:FontList>
18080 18104 
 <a:DataType>varchar(255)</a:DataType>
18081 18105 
 <a:Length>255</a:Length>
18082 18106 
 </o:Column>
18083 
-<o:Column Id="o1063">
18107 
+<o:Column Id="o1065">
18084 18108 
 <a:ObjectID>986D1A7D-1053-4346-AD5C-D64AEE62DD3F</a:ObjectID>
18085 18109 
 <a:Name>img_type</a:Name>
18086 18110 
 <a:Code>img_type</a:Code>
 
@@ -18092,7 +18116,7 @@ LABL 0 新宋体,8,N</a:FontList>
18092 18116 
 <a:DataType>varchar(2)</a:DataType>
18093 18117 
 <a:Length>2</a:Length>
18094 18118 
 </o:Column>
18095 
-<o:Column Id="o1064">
18119 
+<o:Column Id="o1066">
18096 18120 
 <a:ObjectID>A094BD2C-60B5-4AC9-A98E-176D07F29C66</a:ObjectID>
18097 18121 
 <a:Name>create_date</a:Name>
18098 18122 
 <a:Code>create_date</a:Code>
 
@@ -18105,7 +18129,7 @@ LABL 0 新宋体,8,N</a:FontList>
18105 18129 
 </o:Column>
18106 18130 
 </c:Columns>
18107 18131 
 <c:Keys>
18108 
-<o:Key Id="o1065">
18132 
+<o:Key Id="o1067">
18109 18133 
 <a:ObjectID>F8E42723-01EE-48CA-B9B4-9B70D9EE52C2</a:ObjectID>
18110 18134 
 <a:Name>Key_1</a:Name>
18111 18135 
 <a:Code>Key_1</a:Code>
 
@@ -18114,12 +18138,12 @@ LABL 0 新宋体,8,N</a:FontList>
18114 18138 
 <a:ModificationDate>1557307564</a:ModificationDate>
18115 18139 
 <a:Modifier>szc</a:Modifier>
18116 18140 
 <c:Key.Columns>
18117 
-<o:Column Ref="o1059"/>
18141 
+<o:Column Ref="o1061"/>
18118 18142 
 </c:Key.Columns>
18119 18143 
 </o:Key>
18120 18144 
 </c:Keys>
18121 18145 
 <c:PrimaryKey>
18122 
-<o:Key Ref="o1065"/>
18146 
+<o:Key Ref="o1067"/>
18123 18147 
 </c:PrimaryKey>
18124 18148 
 </o:Table>
18125 18149 
 <o:Table Id="o256">
 
@@ -18133,7 +18157,7 @@ LABL 0 新宋体,8,N</a:FontList>
18133 18157 
 <a:Comment>用户车牌号表</a:Comment>
18134 18158 
 <a:TotalSavingCurrency/>
18135 18159 
 <c:Columns>
18136 
-<o:Column Id="o1066">
18160 
+<o:Column Id="o1068">
18137 18161 
 <a:ObjectID>2ADC4DD9-6B52-46D7-80A7-0B269251996F</a:ObjectID>
18138 18162 
 <a:Name>id</a:Name>
18139 18163 
 <a:Code>id</a:Code>
 
@@ -18146,7 +18170,7 @@ LABL 0 新宋体,8,N</a:FontList>
18146 18170 
 <a:Identity>1</a:Identity>
18147 18171 
 <a:Column.Mandatory>1</a:Column.Mandatory>
18148 18172 
 </o:Column>
18149 
-<o:Column Id="o1067">
18173 
+<o:Column Id="o1069">
18150 18174 
 <a:ObjectID>B2476244-EFC3-4FF8-A728-50D1941D12BB</a:ObjectID>
18151 18175 
 <a:Name>community_id</a:Name>
18152 18176 
 <a:Code>community_id</a:Code>
 
@@ -18158,7 +18182,7 @@ LABL 0 新宋体,8,N</a:FontList>
18158 18182 
 <a:DataType>int(11)</a:DataType>
18159 18183 
 <a:Length>11</a:Length>
18160 18184 
 </o:Column>
18161 
-<o:Column Id="o1068">
18185 
+<o:Column Id="o1070">
18162 18186 
 <a:ObjectID>D4FE9889-F81C-40A2-9777-99934795E873</a:ObjectID>
18163 18187 
 <a:Name>ta_user_id</a:Name>
18164 18188 
 <a:Code>ta_user_id</a:Code>
 
@@ -18170,7 +18194,7 @@ LABL 0 新宋体,8,N</a:FontList>
18170 18194 
 <a:DataType>int(11)</a:DataType>
18171 18195 
 <a:Length>11</a:Length>
18172 18196 
 </o:Column>
18173 
-<o:Column Id="o1069">
18197 
+<o:Column Id="o1071">
18174 18198 
 <a:ObjectID>9AF156AE-3592-4A2F-ADD4-AF7D94A024F2</a:ObjectID>
18175 18199 
 <a:Name>license_plate</a:Name>
18176 18200 
 <a:Code>license_plate</a:Code>
 
@@ -18182,7 +18206,7 @@ LABL 0 新宋体,8,N</a:FontList>
18182 18206 
 <a:DataType>varchar(255)</a:DataType>
18183 18207 
 <a:Length>255</a:Length>
18184 18208 
 </o:Column>
18185 
-<o:Column Id="o1070">
18209 
+<o:Column Id="o1072">
18186 18210 
 <a:ObjectID>4AF2667F-B53D-4CAB-9DF9-7388FD52766D</a:ObjectID>
18187 18211 
 <a:Name>order_number</a:Name>
18188 18212 
 <a:Code>order_number</a:Code>
 
@@ -18194,7 +18218,7 @@ LABL 0 新宋体,8,N</a:FontList>
18194 18218 
 <a:DataType>varchar(255)</a:DataType>
18195 18219 
 <a:Length>255</a:Length>
18196 18220 
 </o:Column>
18197 
-<o:Column Id="o1071">
18221 
+<o:Column Id="o1073">
18198 18222 
 <a:ObjectID>33679CF5-35FC-4B38-9BFA-D008AFEB89C3</a:ObjectID>
18199 18223 
 <a:Name>expire_date</a:Name>
18200 18224 
 <a:Code>expire_date</a:Code>
 
@@ -18205,7 +18229,7 @@ LABL 0 新宋体,8,N</a:FontList>
18205 18229 
 <a:Comment>到期时间</a:Comment>
18206 18230 
 <a:DataType>datetime</a:DataType>
18207 18231 
 </o:Column>
18208 
-<o:Column Id="o1072">
18232 
+<o:Column Id="o1074">
18209 18233 
 <a:ObjectID>57CE5A0C-2BD4-4B1F-AED4-D8FFB7C53768</a:ObjectID>
18210 18234 
 <a:Name>unit_price</a:Name>
18211 18235 
 <a:Code>unit_price</a:Code>
 
@@ -18217,7 +18241,7 @@ LABL 0 新宋体,8,N</a:FontList>
18217 18241 
 <a:DataType>varchar(255)</a:DataType>
18218 18242 
 <a:Length>255</a:Length>
18219 18243 
 </o:Column>
18220 
-<o:Column Id="o1073">
18244 
+<o:Column Id="o1075">
18221 18245 
 <a:ObjectID>593C14C2-DC52-447D-9901-15585EB3D25E</a:ObjectID>
18222 18246 
 <a:Name>parking_lot</a:Name>
18223 18247 
 <a:Code>parking_lot</a:Code>
 
@@ -18229,7 +18253,7 @@ LABL 0 新宋体,8,N</a:FontList>
18229 18253 
 <a:DataType>varchar(255)</a:DataType>
18230 18254 
 <a:Length>255</a:Length>
18231 18255 
 </o:Column>
18232 
-<o:Column Id="o1074">
18256 
+<o:Column Id="o1076">
18233 18257 
 <a:ObjectID>B11B597D-C188-4F86-B983-1247AAC74386</a:ObjectID>
18234 18258 
 <a:Name>renew_time</a:Name>
18235 18259 
 <a:Code>renew_time</a:Code>
 
@@ -18241,7 +18265,7 @@ LABL 0 新宋体,8,N</a:FontList>
18241 18265 
 <a:DataType>int(11)</a:DataType>
18242 18266 
 <a:Length>11</a:Length>
18243 18267 
 </o:Column>
18244 
-<o:Column Id="o1075">
18268 
+<o:Column Id="o1077">
18245 18269 
 <a:ObjectID>B9A4F75B-5600-4E03-97CA-F52659AF4566</a:ObjectID>
18246 18270 
 <a:Name>license_type</a:Name>
18247 18271 
 <a:Code>license_type</a:Code>
 
@@ -18253,7 +18277,7 @@ LABL 0 新宋体,8,N</a:FontList>
18253 18277 
 <a:DataType>int(11)</a:DataType>
18254 18278 
 <a:Length>11</a:Length>
18255 18279 
 </o:Column>
18256 
-<o:Column Id="o1076">
18280 
+<o:Column Id="o1078">
18257 18281 
 <a:ObjectID>00FA4FFC-5A5F-4873-881A-EA8B4C2639BD</a:ObjectID>
18258 18282 
 <a:Name>create_date</a:Name>
18259 18283 
 <a:Code>create_date</a:Code>
 
@@ -18264,7 +18288,7 @@ LABL 0 新宋体,8,N</a:FontList>
18264 18288 
 <a:Comment>创建时间</a:Comment>
18265 18289 
 <a:DataType>datetime</a:DataType>
18266 18290 
 </o:Column>
18267 
-<o:Column Id="o1077">
18291 
+<o:Column Id="o1079">
18268 18292 
 <a:ObjectID>C3559530-E9AA-4BB9-A794-582963C4A4BF</a:ObjectID>
18269 18293 
 <a:Name>create_user</a:Name>
18270 18294 
 <a:Code>create_user</a:Code>
 
@@ -18276,7 +18300,7 @@ LABL 0 新宋体,8,N</a:FontList>
18276 18300 
 <a:DataType>int(11)</a:DataType>
18277 18301 
 <a:Length>11</a:Length>
18278 18302 
 </o:Column>
18279 
-<o:Column Id="o1078">
18303 
+<o:Column Id="o1080">
18280 18304 
 <a:ObjectID>AD4AC6D5-678E-49FC-93B0-BB84F617CD00</a:ObjectID>
18281 18305 
 <a:Name>update_date</a:Name>
18282 18306 
 <a:Code>update_date</a:Code>
 
@@ -18287,7 +18311,7 @@ LABL 0 新宋体,8,N</a:FontList>
18287 18311 
 <a:Comment>更新时间</a:Comment>
18288 18312 
 <a:DataType>datetime</a:DataType>
18289 18313 
 </o:Column>
18290 
-<o:Column Id="o1079">
18314 
+<o:Column Id="o1081">
18291 18315 
 <a:ObjectID>85836F40-5F4D-4AB8-9DC7-2345ED8AE5DA</a:ObjectID>
18292 18316 
 <a:Name>update_user</a:Name>
18293 18317 
 <a:Code>update_user</a:Code>
 
@@ -18301,7 +18325,7 @@ LABL 0 新宋体,8,N</a:FontList>
18301 18325 
 </o:Column>
18302 18326 
 </c:Columns>
18303 18327 
 <c:Keys>
18304 
-<o:Key Id="o1080">
18328 
+<o:Key Id="o1082">
18305 18329 
 <a:ObjectID>63206026-120F-43C3-AF49-7BF7198EAA64</a:ObjectID>
18306 18330 
 <a:Name>Key_1</a:Name>
18307 18331 
 <a:Code>Key_1</a:Code>
 
@@ -18310,12 +18334,12 @@ LABL 0 新宋体,8,N</a:FontList>
18310 18334 
 <a:ModificationDate>1557367718</a:ModificationDate>
18311 18335 
 <a:Modifier>szc</a:Modifier>
18312 18336 
 <c:Key.Columns>
18313 
-<o:Column Ref="o1066"/>
18337 
+<o:Column Ref="o1068"/>
18314 18338 
 </c:Key.Columns>
18315 18339 
 </o:Key>
18316 18340 
 </c:Keys>
18317 18341 
 <c:PrimaryKey>
18318 
-<o:Key Ref="o1080"/>
18342 
+<o:Key Ref="o1082"/>
18319 18343 
 </c:PrimaryKey>
18320 18344 
 </o:Table>
18321 18345 
 <o:Table Id="o257">
 
@@ -18329,7 +18353,7 @@ LABL 0 新宋体,8,N</a:FontList>
18329 18353 
 <a:Comment>月租车缴费订单表</a:Comment>
18330 18354 
 <a:TotalSavingCurrency/>
18331 18355 
 <c:Columns>
18332 
-<o:Column Id="o1081">
18356 
+<o:Column Id="o1083">
18333 18357 
 <a:ObjectID>08F36182-AB22-433F-8F51-E805E2ACC919</a:ObjectID>
18334 18358 
 <a:Name>id</a:Name>
18335 18359 
 <a:Code>id</a:Code>
 
@@ -18342,7 +18366,7 @@ LABL 0 新宋体,8,N</a:FontList>
18342 18366 
 <a:Identity>1</a:Identity>
18343 18367 
 <a:Column.Mandatory>1</a:Column.Mandatory>
18344 18368 
 </o:Column>
18345 
-<o:Column Id="o1082">
18369 
+<o:Column Id="o1084">
18346 18370 
 <a:ObjectID>45D65D52-E45F-466F-B13D-4BAB7431D881</a:ObjectID>
18347 18371 
 <a:Name>community_id</a:Name>
18348 18372 
 <a:Code>community_id</a:Code>
 
@@ -18354,7 +18378,7 @@ LABL 0 新宋体,8,N</a:FontList>
18354 18378 
 <a:DataType>int(11)</a:DataType>
18355 18379 
 <a:Length>11</a:Length>
18356 18380 
 </o:Column>
18357 
-<o:Column Id="o1083">
18381 
+<o:Column Id="o1085">
18358 18382 
 <a:ObjectID>80318F85-BB20-4024-9998-D987A98B2C8F</a:ObjectID>
18359 18383 
 <a:Name>user_license_id</a:Name>
18360 18384 
 <a:Code>ta_user_id</a:Code>
 
@@ -18366,7 +18390,7 @@ LABL 0 新宋体,8,N</a:FontList>
18366 18390 
 <a:DataType>int(11)</a:DataType>
18367 18391 
 <a:Length>11</a:Length>
18368 18392 
 </o:Column>
18369 
-<o:Column Id="o1084">
18393 
+<o:Column Id="o1086">
18370 18394 
 <a:ObjectID>63010136-6F76-4F2E-970D-D599445EE9B0</a:ObjectID>
18371 18395 
 <a:Name>order_number</a:Name>
18372 18396 
 <a:Code>order_number</a:Code>
 
@@ -18378,7 +18402,7 @@ LABL 0 新宋体,8,N</a:FontList>
18378 18402 
 <a:DataType>varchar(255)</a:DataType>
18379 18403 
 <a:Length>255</a:Length>
18380 18404 
 </o:Column>
18381 
-<o:Column Id="o1085">
18405 
+<o:Column Id="o1087">
18382 18406 
 <a:ObjectID>D575E6DD-CE84-4ED5-8208-C3C936932B7B</a:ObjectID>
18383 18407 
 <a:Name>order_status</a:Name>
18384 18408 
 <a:Code>order_status</a:Code>
 
@@ -18390,7 +18414,7 @@ LABL 0 新宋体,8,N</a:FontList>
18390 18414 
 <a:DataType>varchar(255)</a:DataType>
18391 18415 
 <a:Length>255</a:Length>
18392 18416 
 </o:Column>
18393 
-<o:Column Id="o1086">
18417 
+<o:Column Id="o1088">
18394 18418 
 <a:ObjectID>2D0B1C89-FCE7-43EB-9E46-3814A128EAA1</a:ObjectID>
18395 18419 
 <a:Name>create_user</a:Name>
18396 18420 
 <a:Code>create_user</a:Code>
 
@@ -18402,7 +18426,7 @@ LABL 0 新宋体,8,N</a:FontList>
18402 18426 
 <a:DataType>int(11)</a:DataType>
18403 18427 
 <a:Length>11</a:Length>
18404 18428 
 </o:Column>
18405 
-<o:Column Id="o1087">
18429 
+<o:Column Id="o1089">
18406 18430 
 <a:ObjectID>A1476C8B-868D-4B30-ACD0-08C86C003A27</a:ObjectID>
18407 18431 
 <a:Name>create_date</a:Name>
18408 18432 
 <a:Code>create_date</a:Code>
 
@@ -18413,7 +18437,7 @@ LABL 0 新宋体,8,N</a:FontList>
18413 18437 
 <a:Comment>创建时间</a:Comment>
18414 18438 
 <a:DataType>datetime</a:DataType>
18415 18439 
 </o:Column>
18416 
-<o:Column Id="o1088">
18440 
+<o:Column Id="o1090">
18417 18441 
 <a:ObjectID>BE3B494A-E8E4-421E-A871-FD700644271F</a:ObjectID>
18418 18442 
 <a:Name>update_user</a:Name>
18419 18443 
 <a:Code>update_user</a:Code>
 
@@ -18425,7 +18449,7 @@ LABL 0 新宋体,8,N</a:FontList>
18425 18449 
 <a:DataType>int(11)</a:DataType>
18426 18450 
 <a:Length>11</a:Length>
18427 18451 
 </o:Column>
18428 
-<o:Column Id="o1089">
18452 
+<o:Column Id="o1091">
18429 18453 
 <a:ObjectID>A34F3B8C-7F9A-41ED-BD96-44A95D08C547</a:ObjectID>
18430 18454 
 <a:Name>update_date</a:Name>
18431 18455 
 <a:Code>update_date</a:Code>
 
@@ -18436,7 +18460,7 @@ LABL 0 新宋体,8,N</a:FontList>
18436 18460 
 <a:Comment>更新时间</a:Comment>
18437 18461 
 <a:DataType>datetime</a:DataType>
18438 18462 
 </o:Column>
18439 
-<o:Column Id="o1090">
18463 
+<o:Column Id="o1092">
18440 18464 
 <a:ObjectID>8EA7049C-94A1-453E-B283-8E79F440BCEB</a:ObjectID>
18441 18465 
 <a:Name>extension_month</a:Name>
18442 18466 
 <a:Code>extension_month</a:Code>
 
@@ -18448,7 +18472,7 @@ LABL 0 新宋体,8,N</a:FontList>
18448 18472 
 <a:DataType>int(11)</a:DataType>
18449 18473 
 <a:Length>11</a:Length>
18450 18474 
 </o:Column>
18451 
-<o:Column Id="o1091">
18475 
+<o:Column Id="o1093">
18452 18476 
 <a:ObjectID>749D6A1D-5072-45E8-9826-22579FD72F1F</a:ObjectID>
18453 18477 
 <a:Name>extension_price</a:Name>
18454 18478 
 <a:Code>extension_price</a:Code>
 
@@ -18460,7 +18484,7 @@ LABL 0 新宋体,8,N</a:FontList>
18460 18484 
 <a:DataType>varchar(255)</a:DataType>
18461 18485 
 <a:Length>255</a:Length>
18462 18486 
 </o:Column>
18463 
-<o:Column Id="o1092">
18487 
+<o:Column Id="o1094">
18464 18488 
 <a:ObjectID>E0395793-A050-4735-96E3-F17749B36CEC</a:ObjectID>
18465 18489 
 <a:Name>payment_tel</a:Name>
18466 18490 
 <a:Code>payment_tel</a:Code>
 
@@ -18472,7 +18496,7 @@ LABL 0 新宋体,8,N</a:FontList>
18472 18496 
 <a:DataType>varchar(255)</a:DataType>
18473 18497 
 <a:Length>255</a:Length>
18474 18498 
 </o:Column>
18475 
-<o:Column Id="o1093">
18499 
+<o:Column Id="o1095">
18476 18500 
 <a:ObjectID>3D0DBFAF-ACCA-4178-AEC7-478CABDABE68</a:ObjectID>
18477 18501 
 <a:Name>payment_name</a:Name>
18478 18502 
 <a:Code>payment_name</a:Code>
 
@@ -18484,7 +18508,7 @@ LABL 0 新宋体,8,N</a:FontList>
18484 18508 
 <a:DataType>varchar(255)</a:DataType>
18485 18509 
 <a:Length>255</a:Length>
18486 18510 
 </o:Column>
18487 
-<o:Column Id="o1094">
18511 
+<o:Column Id="o1096">
18488 18512 
 <a:ObjectID>2C17C691-0E31-4CD5-A8A7-5D326BB722F7</a:ObjectID>
18489 18513 
 <a:Name>payment_type</a:Name>
18490 18514 
 <a:Code>payment_type</a:Code>
 
@@ -18496,7 +18520,7 @@ LABL 0 新宋体,8,N</a:FontList>
18496 18520 
 <a:DataType>varchar(2)</a:DataType>
18497 18521 
 <a:Length>2</a:Length>
18498 18522 
 </o:Column>
18499 
-<o:Column Id="o1095">
18523 
+<o:Column Id="o1097">
18500 18524 
 <a:ObjectID>431D00B1-22B7-4183-9E3C-8DC9222B68A9</a:ObjectID>
18501 18525 
 <a:Name>expire_date</a:Name>
18502 18526 
 <a:Code>expire_date</a:Code>
 
@@ -18507,7 +18531,7 @@ LABL 0 新宋体,8,N</a:FontList>
18507 18531 
 <a:Comment>到期时间</a:Comment>
18508 18532 
 <a:DataType>datetime</a:DataType>
18509 18533 
 </o:Column>
18510 
-<o:Column Id="o1096">
18534 
+<o:Column Id="o1098">
18511 18535 
 <a:ObjectID>9D078A47-1407-4881-9BAC-287FC15BBEB6</a:ObjectID>
18512 18536 
 <a:Name>unit_price</a:Name>
18513 18537 
 <a:Code>unit_price</a:Code>
 
@@ -18519,7 +18543,7 @@ LABL 0 新宋体,8,N</a:FontList>
18519 18543 
 <a:DataType>varchar(255)</a:DataType>
18520 18544 
 <a:Length>255</a:Length>
18521 18545 
 </o:Column>
18522 
-<o:Column Id="o1097">
18546 
+<o:Column Id="o1099">
18523 18547 
 <a:ObjectID>F78B78EC-E859-47C1-AC9D-A3E1B0CBA926</a:ObjectID>
18524 18548 
 <a:Name>parking_lot</a:Name>
18525 18549 
 <a:Code>parking_lot</a:Code>
 
@@ -18531,7 +18555,7 @@ LABL 0 新宋体,8,N</a:FontList>
18531 18555 
 <a:DataType>varchar(255)</a:DataType>
18532 18556 
 <a:Length>255</a:Length>
18533 18557 
 </o:Column>
18534 
-<o:Column Id="o1098">
18558 
+<o:Column Id="o1100">
18535 18559 
 <a:ObjectID>9273BE9C-B9DC-4C92-AA4D-018829225523</a:ObjectID>
18536 18560 
 <a:Name>license_plate</a:Name>
18537 18561 
 <a:Code>license_plate</a:Code>
 
@@ -18545,7 +18569,7 @@ LABL 0 新宋体,8,N</a:FontList>
18545 18569 
 </o:Column>
18546 18570 
 </c:Columns>
18547 18571 
 <c:Keys>
18548 
-<o:Key Id="o1099">
18572 
+<o:Key Id="o1101">
18549 18573 
 <a:ObjectID>F57D4E18-1528-44BD-BEBB-4680F3D77BDA</a:ObjectID>
18550 18574 
 <a:Name>Key_1</a:Name>
18551 18575 
 <a:Code>Key_1</a:Code>
 
@@ -18554,12 +18578,12 @@ LABL 0 新宋体,8,N</a:FontList>
18554 18578 
 <a:ModificationDate>1557372945</a:ModificationDate>
18555 18579 
 <a:Modifier>szc</a:Modifier>
18556 18580 
 <c:Key.Columns>
18557 
-<o:Column Ref="o1081"/>
18581 
+<o:Column Ref="o1083"/>
18558 18582 
 </c:Key.Columns>
18559 18583 
 </o:Key>
18560 18584 
 </c:Keys>
18561 18585 
 <c:PrimaryKey>
18562 
-<o:Key Ref="o1099"/>
18586 
+<o:Key Ref="o1101"/>
18563 18587 
 </c:PrimaryKey>
18564 18588 
 </o:Table>
18565 18589 
 <o:Table Id="o259">
 
@@ -18573,7 +18597,7 @@ LABL 0 新宋体,8,N</a:FontList>
18573 18597 
 <a:Comment>app端版本号</a:Comment>
18574 18598 
 <a:TotalSavingCurrency/>
18575 18599 
 <c:Columns>
18576 
-<o:Column Id="o1100">
18600 
+<o:Column Id="o1102">
18577 18601 
 <a:ObjectID>A9874095-1A7A-41B3-BDAA-89FF219B226F</a:ObjectID>
18578 18602 
 <a:Name>id</a:Name>
18579 18603 
 <a:Code>id</a:Code>
 
@@ -18585,7 +18609,7 @@ LABL 0 新宋体,8,N</a:FontList>
18585 18609 
 <a:Length>11</a:Length>
18586 18610 
 <a:Column.Mandatory>1</a:Column.Mandatory>
18587 18611 
 </o:Column>
18588 
-<o:Column Id="o1101">
18612 
+<o:Column Id="o1103">
18589 18613 
 <a:ObjectID>946CB4DD-6B85-465A-895E-5E8A8F2BA7C3</a:ObjectID>
18590 18614 
 <a:Name>client_version</a:Name>
18591 18615 
 <a:Code>client_version</a:Code>
 
@@ -18597,7 +18621,7 @@ LABL 0 新宋体,8,N</a:FontList>
18597 18621 
 <a:DataType>varchar(255)</a:DataType>
18598 18622 
 <a:Length>255</a:Length>
18599 18623 
 </o:Column>
18600 
-<o:Column Id="o1102">
18624 
+<o:Column Id="o1104">
18601 18625 
 <a:ObjectID>BDFD3026-FC17-4D03-A503-7AF3A37592A5</a:ObjectID>
18602 18626 
 <a:Name>service_version</a:Name>
18603 18627 
 <a:Code>service_version</a:Code>
 
@@ -18609,7 +18633,7 @@ LABL 0 新宋体,8,N</a:FontList>
18609 18633 
 <a:DataType>varchar(255)</a:DataType>
18610 18634 
 <a:Length>255</a:Length>
18611 18635 
 </o:Column>
18612 
-<o:Column Id="o1103">
18636 
+<o:Column Id="o1105">
18613 18637 
 <a:ObjectID>3D77C63D-552E-4815-8BBB-148013A10319</a:ObjectID>
18614 18638 
 <a:Name>type</a:Name>
18615 18639 
 <a:Code>type</a:Code>
 
@@ -18621,7 +18645,7 @@ LABL 0 新宋体,8,N</a:FontList>
18621 18645 
 <a:DataType>varchar(255)</a:DataType>
18622 18646 
 <a:Length>255</a:Length>
18623 18647 
 </o:Column>
18624 
-<o:Column Id="o1104">
18648 
+<o:Column Id="o1106">
18625 18649 
 <a:ObjectID>1414BD13-AA8D-4144-BA19-810AED96EE55</a:ObjectID>
18626 18650 
 <a:Name>update_address</a:Name>
18627 18651 
 <a:Code>update_address</a:Code>
 
@@ -18635,7 +18659,7 @@ LABL 0 新宋体,8,N</a:FontList>
18635 18659 
 </o:Column>
18636 18660 
 </c:Columns>
18637 18661 
 <c:Keys>
18638 
-<o:Key Id="o1105">
18662 
+<o:Key Id="o1107">
18639 18663 
 <a:ObjectID>81BA3F75-E9E6-4FF0-BC41-4D8BAF735EDC</a:ObjectID>
18640 18664 
 <a:Name>Key_1</a:Name>
18641 18665 
 <a:Code>Key_1</a:Code>
 
@@ -18644,17 +18668,17 @@ LABL 0 新宋体,8,N</a:FontList>
18644 18668 
 <a:ModificationDate>1557800616</a:ModificationDate>
18645 18669 
 <a:Modifier>szc</a:Modifier>
18646 18670 
 <c:Key.Columns>
18647 
-<o:Column Ref="o1100"/>
18671 
+<o:Column Ref="o1102"/>
18648 18672 
 </c:Key.Columns>
18649 18673 
 </o:Key>
18650 18674 
 </c:Keys>
18651 18675 
 <c:PrimaryKey>
18652 
-<o:Key Ref="o1105"/>
18676 
+<o:Key Ref="o1107"/>
18653 18677 
 </c:PrimaryKey>
18654 18678 
 </o:Table>
18655 18679 
 </c:Tables>
18656 18680 
 <c:DefaultGroups>
18657 
-<o:Group Id="o1106">
18681 
+<o:Group Id="o1108">
18658 18682 
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
18659 18683 
 <a:Name>PUBLIC</a:Name>
18660 18684 
 <a:Code>PUBLIC</a:Code>
 
@@ -19317,7 +19341,7 @@ LABL 0 新宋体,8,N</a:FontList>
19317 19341 
 </o:ExtendedDependency>
19318 19342 
 </c:ChildTraceabilityLinks>
19319 19343 
 <c:TargetModels>
19320 
-<o:TargetModel Id="o1107">
19344 
+<o:TargetModel Id="o1109">
19321 19345 
 <a:ObjectID>B86EB932-C352-4174-86E4-2D2B1DDE4A45</a:ObjectID>
19322 19346 
 <a:Name>MySQL 5.0</a:Name>
19323 19347 
 <a:Code>MYSQL50</a:Code>