Merge branch 'SZDAS_V2.0' of http://gitlab.archser.com/common/aserver.git into SZDAS_V2.0

src/main/resources/DBUpdate/DM_UpdateSQL.xml

@@ -1980,8 +1980,8 @@
 		</sql>
 		<sql creator="ChengYaqing" createDate="20200910" note="创建原始数据信息保存表">
 			CREATE TABLE  AS_SOURCE_DATA
-			("ID" NUMBER(32,0) primary key,
-			"TABLE" VARCHAR2(50),
+			("ID" NUMBER(9,0) primary key,
+			"TABLE_NAME" VARCHAR2(50),
 			"TASK_ID" NUMBER(9,0),
 			"RECEIVE_TIME" TIMESTAMP(6),
 			"IDENTIFIER" VARCHAR2(150));
@@ -1995,6 +1995,19 @@
             alter table AS_STORAGE add STORAGE_NO VARCHAR2(100);
         </sql>
     </version>
+    <version edition="80" description="库房表">
+        <sql creator="chengYaqing" createDate="20200916" note="关联表">
+			alter TABLE AS_CONFIG_RELATION drop column FIXED;
+			alter TABLE AS_CONFIG_RELATION drop column COMPOSE;
+			alter TABLE AS_CONFIG_RELATION add (
+				TABLE_ID number(9,0),
+				COLUMN_ID varchar2(100),
+				TYPE number(3,0),
+				SECOND_TYPE number(3,0)
+			);
+        </sql>
+    </version>
+    
     
     
     <version edition="80" description="创建库房号配置表表单">