Merge remote-tracking branch 'origin/dev' into test

src/main/resources/database.sql

@@ -1445,22 +1445,22 @@ CREATE UNIQUE INDEX paper_author_pkey ON paper_author USING btree (paper_id,name
ALTER TABLE paper_author ADD PRIMARY KEY (paper_id,name);
CREATE TABLE ORG_REG_INFO (
NAME TEXT  COLLATE "zh_CN.utf8" NOT NULL,
NUM TEXT NOT NULL,
CODE TEXT NOT NULL,
NUM TEXT ,
CODE TEXT,
CREDIT_CODE TEXT,
"TYPE" TEXT NOT NULL,
INDUSTRY TEXT NOT NULL,
OPERATING_PERIOD TEXT NOT NULL,
DAY_OF_APPROVAL TEXT NOT NULL,
MANAGER TEXT NOT NULL,
ADDR TEXT NOT NULL,
SCOPE_OF_BUSINESS TEXT NOT NULL);
ALTER TABLE ORG_REG_INFO ADD PRIMARY KEY (CODE);
TYPE TEXT,
INDUSTRY TEXT,
OPERATING_PERIOD TEXT,
DAY_OF_APPROVAL TEXT,
MANAGER TEXT,
ADDR TEXT,
SCOPE_OF_BUSINESS TEXT);
ALTER TABLE ORG_REG_INFO ADD PRIMARY KEY (NAME);
COMMENT ON COLUMN ORG_REG_INFO.NAME IS '注册名称';
COMMENT ON COLUMN ORG_REG_INFO.NUM IS '工商注册号';
COMMENT ON COLUMN ORG_REG_INFO.CODE IS '组织机构代码';
COMMENT ON COLUMN ORG_REG_INFO.CREDIT_CODE IS '统一信用代码';
COMMENT ON COLUMN ORG_REG_INFO."TYPE" IS '企业类型';
COMMENT ON COLUMN ORG_REG_INFO.TYPE IS '企业类型';
COMMENT ON COLUMN ORG_REG_INFO.INDUSTRY IS '行业';
COMMENT ON COLUMN ORG_REG_INFO.OPERATING_PERIOD IS '营业期限';
COMMENT ON COLUMN ORG_REG_INFO.DAY_OF_APPROVAL IS '核准日期';