Merge remote-tracking branch 'origin/SZDAS_V2.0' into SZDAS_V2.0

pom.xml

@@ -28,7 +28,7 @@
 
     <junit.version>3.8.1</junit.version>
 
-    <jfinal.version>5.1.4</jfinal.version>
+    <jfinal.version>5.1.4.1</jfinal.version>
 
     <cos.version>2017.5</cos.version>
 

src/main/resources/DBUpdate/DM_UpdateSQL.xml

@@ -3115,4 +3115,17 @@ commit;
 		</sql>
 	</version>
 
+	<version edition="155" description="卷内显示案卷字段规则">
+		<sql creator="huwenbin" createDate="20210414" note="卷内显示案卷字段规则">
+			CREATE TABLE "AS_RULE_AJ_COLUMN"
+			(
+			"ID" NUMBER(10,0) NOT NULL,
+			"ORGAN_ID" NUMBER(10,0),
+			"TABLE_ID" NUMBER(10,0),
+			"RULE" VARCHAR2(300),
+			"STAGE" VARCHAR2(50),
+			PRIMARY KEY("ID"));
+		</sql>
+	</version>
+
 </update>
\ No newline at end of file

src/main/resources/DBUpdate/KINGBASE_UpdateSQL.xml

@@ -3095,4 +3095,16 @@ commit;
 			alter table AS_SCAN_SETTING add WATERMARK_LEAN NUMBER(11,0);
 		</sql>
 	</version>
+	<version edition="151" description="卷内显示案卷字段规则">
+		<sql creator="huwenbin" createDate="20210414" note="卷内显示案卷字段规则">
+			CREATE TABLE "AS_RULE_AJ_COLUMN"
+			(
+			"ID" NUMBER(10,0) NOT NULL,
+			"ORGAN_ID" NUMBER(10,0),
+			"TABLE_ID" NUMBER(10,0),
+			"RULE" VARCHAR2(300),
+			"STAGE" VARCHAR2(50),
+			PRIMARY KEY("ID"));
+		</sql>
+	</version>
 </update>
\ No newline at end of file

src/main/resources/DBUpdate/ST_UpdateSQL.xml

@@ -3104,4 +3104,16 @@ commit;
 			alter table AS_SCAN_SETTING add WATERMARK_LEAN NUMBER(11,0);
 		</sql>
 	</version>
+	<version edition="151" description="卷内显示案卷字段规则">
+		<sql creator="huwenbin" createDate="20210414" note="卷内显示案卷字段规则">
+			CREATE TABLE "AS_RULE_AJ_COLUMN"
+			(
+			"ID" NUMBER(10,0) NOT NULL,
+			"ORGAN_ID" NUMBER(10,0),
+			"TABLE_ID" NUMBER(10,0),
+			"RULE" VARCHAR2(300),
+			"STAGE" VARCHAR2(50),
+			PRIMARY KEY("ID"));
+		</sql>
+	</version>
 </update>
\ No newline at end of file