resolve merge conflict with master branch

Author: yuanyl630

CN/modules/ROOT/nav.adoc

@@ -26,7 +26,7 @@
 **** xref:master/6.3.2.adoc[OUT 参数]
 **** xref:master/6.3.4.adoc[%TYPE、%ROWTYPE]
 **** xref:master/6.3.5.adoc[NLS 参数]
-**** xref:master/6.3.6.adoc[大小写转换]
+**** xref:master/6.3.9.adoc[大小写转换]
 *** xref:master/6.4.adoc[国标GB18030]
 ** Oracle兼容功能列表
 *** xref:master/7.1.adoc[1、框架设计]

CN/modules/ROOT/pages/master/6.3.6.adoc CN/modules/ROOT/pages/master/6.3.9.adocCN/modules/ROOT/pages/master/6.3.6.adoc renamed to CN/modules/ROOT/pages/master/6.3.9.adoc

@@ -25,7 +25,7 @@
 *** xref:master/6.3.2.adoc[OUT Parameter]
 *** xref:master/6.3.4.adoc[%Type & %Rowtype]
 *** xref:master/6.3.5.adoc[NLS Parameters]
-*** xref:master/6.3.6.adoc[Case Conversion]
+*** xref:master/6.3.9.adoc[Case Conversion]
 ** xref:master/6.4.adoc[GB18030 Character Set]
 * List of Oracle compatible features
 ** xref:master/7.1.adoc[1、Ivorysql frame design]