Merge remote-tracking branch 'origin/master'

whepi-doc/login.sql

@@ -80,12 +80,11 @@ CREATE TABLE sys_owner_linkman  (
 ) ENGINE = InnoDB default charset=utf8 comment = '业委会联系人表';
 
 -- ----------------------------
+-- Table structure for sys_uptown_home
 -- ----------------------------
-DROP TABLE IF EXISTS sys_uptown_house;
-CREATE TABLE sys_uptown_house  (
+DROP TABLE IF EXISTS sys_uptown_home;
+CREATE TABLE sys_uptown_home  (
   house_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '门牌ID',
-  uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID',
   linkman           varchar(10)  NOT NULL DEFAULT '' COMMENT '联系人名称',
   phone             varchar(20)  NOT NULL DEFAULT '' COMMENT '联系人电话',
   young             int(11) NOT NULL DEFAULT 0 COMMENT '家庭年前人数',
@@ -128,4 +127,17 @@ CREATE TABLE sys_uptown  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (uptown_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '小区表';
+) ENGINE = InnoDB default charset=utf8 comment = '小区表';
+
+DROP TABLE IF EXISTS sys_uptown_house;
+CREATE TABLE sys_uptown_house  (
+  house_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '门牌ID',
+  uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID',
+  ridgepole         varchar(20) NOT NULL DEFAULT '' COMMENT '栋',
+  unit              varchar(20) NOT NULL DEFAULT '' COMMENT '单元',
+  doorplate         varchar(20)  NOT NULL DEFAULT '' COMMENT '门牌',
+  status            int(11) NOT NULL DEFAULT 0 COMMENT '状态:1正常,0草稿,-1删除',
+  time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
+  time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  PRIMARY KEY (house_id) USING BTREE
+) ENGINE = InnoDB default charset=utf8 comment = '门牌信息表';