Merge remote-tracking branch 'origin/master'

whepi-doc/task.sql

@@ -9,8 +9,9 @@ create table qz_task (
     task_status     int(11)         NOT NULL DEFAULT 0          COMMENT '求助状态：1未解决，2处理中，3已处理',
     remark          varchar(100)    NOT NULL DEFAULT ''         COMMENT '备注',
     user_id         bigint(20)      NOT NULL DEFAULT 0          COMMENT '用户ID',
-    house_id        bigint(20)      NOT NULL DEFAULT 0          COMMENT '家庭ID',
+    user_name       varchar(20)     NOT NULL DEFAULT ''         COMMENT '用户名称',
     house_number    varchar(20)     NOT NULL DEFAULT ''         COMMENT '门牌号',
+    house_id        varchar(20)     NOT NULL DEFAULT ''         COMMENT '门牌号ID',
 
     user_create     bigint(20)      NOT NULL DEFAULT 0          COMMENT '新增人',
     time_create     datetime(0)     NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
@@ -38,5 +39,6 @@ CREATE TABLE qz_task_reply (
     time_create       datetime(0)   NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
     user_update       bigint(20)    NOT NULL DEFAULT 0      COMMENT '修改人',
     time_update       datetime(0)   NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
-    PRIMARY KEY (reply_id) USING BTREE
+    PRIMARY KEY (reply_id) USING BTREE,
+    INDEX task_id(task_id) USING BTREE
 ) ENGINE = InnoDB default charset=utf8 comment = '家庭求助回复表';