git-svn-id: https://192.168.57.71/svn/jsgkj@1908 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/doc/数据库设计/gkaqPdm.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{F3AB11CE-11E9-491B-B880-5869E07ED9B2}" Label="" LastModificationDate="1483432999" Name="gkaqPdm" Objects="1158" Symbols="37" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{F3AB11CE-11E9-491B-B880-5869E07ED9B2}" Label="" LastModificationDate="1485072114" Name="gkaqPdm" Objects="1078" Symbols="37" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.1.0.2850"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -1840,9 +1840,7 @@ CheckRequested=Yes</a:PackageOptionsText>
 CaseSensitive=No
 DisplayName=Yes
 EnableTrans=No
-UseTerm=No
 EnableRequirements=No
-EnableFullShortcut=No
 DefaultDttp=
 IgnoreOwner=No
 RebuildTrigger=Yes
@@ -1886,6 +1884,8 @@ RefrUpdateConstraint=1
 RefrParentMandatory=No
 RefrParentChangeAllow=Yes
 RefrCheckOnCommit=No
+UseTerm=No
+EnableFullShortcut=No
 
 [ModelOptions\Physical Objects\NamingOptionsTemplates]
 
@@ -2283,9 +2283,9 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\MEAS]
+[ModelOptions\Physical Objects\ClssNamingOptions\CUBE]
 
-[ModelOptions\Physical Objects\ClssNamingOptions\MEAS\Name]
+[ModelOptions\Physical Objects\ClssNamingOptions\CUBE\Name]
 Template=
 MaxLen=254
 Case=M
@@ -2298,7 +2298,7 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\MEAS\Code]
+[ModelOptions\Physical Objects\ClssNamingOptions\CUBE\Code]
 Template=
 MaxLen=254
 Case=M
@@ -2311,9 +2311,9 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\DATTR]
+[ModelOptions\Physical Objects\ClssNamingOptions\MEAS]
 
-[ModelOptions\Physical Objects\ClssNamingOptions\DATTR\Name]
+[ModelOptions\Physical Objects\ClssNamingOptions\MEAS\Name]
 Template=
 MaxLen=254
 Case=M
@@ -2326,7 +2326,7 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\DATTR\Code]
+[ModelOptions\Physical Objects\ClssNamingOptions\MEAS\Code]
 Template=
 MaxLen=254
 Case=M
@@ -2339,9 +2339,9 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\FILO]
+[ModelOptions\Physical Objects\ClssNamingOptions\DATTR]
 
-[ModelOptions\Physical Objects\ClssNamingOptions\FILO\Name]
+[ModelOptions\Physical Objects\ClssNamingOptions\DATTR\Name]
 Template=
 MaxLen=254
 Case=M
@@ -2354,7 +2354,7 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\FILO\Code]
+[ModelOptions\Physical Objects\ClssNamingOptions\DATTR\Code]
 Template=
 MaxLen=254
 Case=M
@@ -2367,9 +2367,9 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\FRMEOBJ]
+[ModelOptions\Physical Objects\ClssNamingOptions\FILO]
 
-[ModelOptions\Physical Objects\ClssNamingOptions\FRMEOBJ\Name]
+[ModelOptions\Physical Objects\ClssNamingOptions\FILO\Name]
 Template=
 MaxLen=254
 Case=M
@@ -2382,7 +2382,7 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\FRMEOBJ\Code]
+[ModelOptions\Physical Objects\ClssNamingOptions\FILO\Code]
 Template=
 MaxLen=254
 Case=M
@@ -2395,9 +2395,9 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\FRMELNK]
+[ModelOptions\Physical Objects\ClssNamingOptions\FRMEOBJ]
 
-[ModelOptions\Physical Objects\ClssNamingOptions\FRMELNK\Name]
+[ModelOptions\Physical Objects\ClssNamingOptions\FRMEOBJ\Name]
 Template=
 MaxLen=254
 Case=M
@@ -2410,7 +2410,7 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\FRMELNK\Code]
+[ModelOptions\Physical Objects\ClssNamingOptions\FRMEOBJ\Code]
 Template=
 MaxLen=254
 Case=M
@@ -2423,9 +2423,9 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\DefaultClass]
+[ModelOptions\Physical Objects\ClssNamingOptions\FRMELNK]
 
-[ModelOptions\Physical Objects\ClssNamingOptions\DefaultClass\Name]
+[ModelOptions\Physical Objects\ClssNamingOptions\FRMELNK\Name]
 Template=
 MaxLen=254
 Case=M
@@ -2438,7 +2438,7 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\DefaultClass\Code]
+[ModelOptions\Physical Objects\ClssNamingOptions\FRMELNK\Code]
 Template=
 MaxLen=254
 Case=M
@@ -2451,9 +2451,9 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\CUBE]
+[ModelOptions\Physical Objects\ClssNamingOptions\DefaultClass]
 
-[ModelOptions\Physical Objects\ClssNamingOptions\CUBE\Name]
+[ModelOptions\Physical Objects\ClssNamingOptions\DefaultClass\Name]
 Template=
 MaxLen=254
 Case=M
@@ -2466,7 +2466,7 @@ Script=
 ConvTable=
 ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
-[ModelOptions\Physical Objects\ClssNamingOptions\CUBE\Code]
+[ModelOptions\Physical Objects\ClssNamingOptions\DefaultClass\Code]
 Template=
 MaxLen=254
 Case=M
@@ -2485,15 +2485,6 @@ ConvTablePath=%_HOME%\Resource Files\Conversion Tables
 
 [ModelOptions\Generate]
 
-[ModelOptions\Generate\Xsm]
-GenRootElement=Yes
-GenComplexType=No
-GenAttribute=Yes
-CheckModel=Yes
-SaveLinks=Yes
-ORMapping=No
-NameToCode=No
-
 [ModelOptions\Generate\Pdm]
 RRMapping=No
 
@@ -2510,6 +2501,15 @@ ORMapping=No
 NameToCode=Yes
 ClassPrefix=
 
+[ModelOptions\Generate\Xsm]
+CheckModel=Yes
+SaveLinks=Yes
+ORMapping=No
+NameToCode=No
+GenRootElement=Yes
+GenComplexType=No
+GenAttribute=Yes
+
 [ModelOptions\Generate\Ldm]
 CheckModel=Yes
 SaveLinks=Yes
@@ -5150,7 +5150,7 @@ monitoring
 <a:ServerCheckExpression>&quot;ID&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0028427</a:CheckConstraintName>
 </o:Column>
 <o:Column Id="o159">
@@ -5318,7 +5318,7 @@ monitoring
 <a:Comment>ID</a:Comment>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o167">
 <a:ObjectID>06E8697D-B7A8-4811-BA0B-A0F25721D897</a:ObjectID>
@@ -5915,7 +5915,7 @@ monitoring
 <a:DefaultValue>N</a:DefaultValue>
 <a:ServerCheckExpression>&quot;SFZDSP&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>CHAR</a:DataType>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0030031</a:CheckConstraintName>
 </o:Column>
 <o:Column Id="o218">
@@ -6076,7 +6076,7 @@ monitoring
 <a:Comment>唯一标识</a:Comment>
 <a:DataType>VARCHAR2(40 char)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o227">
 <a:ObjectID>DB0660D2-8810-496B-9BB0-2F95986870AD</a:ObjectID>
@@ -6263,7 +6263,7 @@ monitoring
 <a:DefaultValue>~sys_guid()~</a:DefaultValue>
 <a:DataType>VARCHAR2(40 char)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o238">
 <a:ObjectID>20A3EC1E-F973-48DF-9689-95317715C7CF</a:ObjectID>
@@ -6472,7 +6472,7 @@ monitoring
 <a:ServerCheckExpression>&quot;ID&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0028351</a:CheckConstraintName>
 </o:Column>
 <o:Column Id="o251">
@@ -6615,9 +6615,9 @@ monitoring
 <a:Code>AQ_BASIC_FRAME_GROUP_BUTTON</a:Code>
 <a:CreationDate>1476416662</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1483063483</a:ModificationDate>
-<a:Modifier>Administrator</a:Modifier>
-<a:Comment>角色按钮关系信息</a:Comment>
+<a:ModificationDate>1485072102</a:ModificationDate>
+<a:Modifier>yuanxd</a:Modifier>
+<a:Comment>分组按钮关系信息</a:Comment>
 <a:PhysicalOptions>pctfree 10
 initrans 1
 storage
@@ -6644,7 +6644,7 @@ monitoring
 <a:Comment>唯一标识</a:Comment>
 <a:DataType>VARCHAR2(40 char)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o261">
 <a:ObjectID>AAA6F2BC-9411-4FC7-950F-ED389B01693E</a:ObjectID>
@@ -6751,9 +6751,9 @@ monitoring
 <a:Code>AQ_BASIC_FRAME_GROUP_MENU</a:Code>
 <a:CreationDate>1476416662</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1483063483</a:ModificationDate>
-<a:Modifier>Administrator</a:Modifier>
-<a:Comment>角色菜单关系信息</a:Comment>
+<a:ModificationDate>1485072114</a:ModificationDate>
+<a:Modifier>yuanxd</a:Modifier>
+<a:Comment>分组菜单关系信息</a:Comment>
 <a:PhysicalOptions>pctfree 10
 initrans 1
 storage
@@ -6780,7 +6780,7 @@ monitoring
 <a:Comment>唯一标识</a:Comment>
 <a:DataType>VARCHAR2(40 char)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o268">
 <a:ObjectID>E5BEAF04-0507-4AE0-A8A2-254C365F2176</a:ObjectID>
@@ -6916,7 +6916,7 @@ monitoring
 <a:Comment>唯一标识</a:Comment>
 <a:DataType>VARCHAR2(40 char)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o275">
 <a:ObjectID>6235E9E0-803B-467C-A281-93876D3DB7B1</a:ObjectID>
@@ -7163,7 +7163,7 @@ monitoring
 <a:ServerCheckExpression>&quot;ID&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0028403</a:CheckConstraintName>
 <c:AttachedRules>
 <o:BusinessRule Ref="o80"/>
@@ -7420,7 +7420,7 @@ monitoring
 <a:Comment>唯一标识</a:Comment>
 <a:DataType>VARCHAR2(40 char)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o308">
 <a:ObjectID>97417140-DB39-49AA-B6A3-AAD9037D3A7E</a:ObjectID>
@@ -7445,7 +7445,7 @@ monitoring
 <a:Comment>参数值</a:Comment>
 <a:DataType>VARCHAR2(100 char)</a:DataType>
 <a:Length>100</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o310">
 <a:ObjectID>489B6E72-7544-4153-B4A6-8FEC460532A3</a:ObjectID>
@@ -7606,7 +7606,7 @@ monitoring
 <a:ServerCheckExpression>&quot;ID&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0028348</a:CheckConstraintName>
 </o:Column>
 <o:Column Id="o319">
@@ -7790,7 +7790,7 @@ monitoring
 <a:ServerCheckExpression>&quot;ID&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>VARCHAR2(40 char)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0030216</a:CheckConstraintName>
 </o:Column>
 <o:Column Id="o330">
@@ -7906,7 +7906,7 @@ monitoring
 <a:ServerCheckExpression>&quot;ID&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>VARCHAR2(40 char)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0030219</a:CheckConstraintName>
 </o:Column>
 <o:Column Id="o335">
@@ -8042,7 +8042,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o342">
 <a:ObjectID>F3A1B5BD-6300-4C08-826B-953C67992C6F</a:ObjectID>
@@ -8282,7 +8282,7 @@ monitoring
 <a:Comment>唯一标识</a:Comment>
 <a:DataType>VARCHAR2(40 char)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o358">
 <a:ObjectID>BFC0D65A-3646-490F-A8FF-E69F456F3335</a:ObjectID>
@@ -8440,7 +8440,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR(64)</a:DataType>
 <a:Length>64</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o367">
 <a:ObjectID>2E109A97-0BB0-492A-B499-05884796E02F</a:ObjectID>
@@ -8917,7 +8917,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR(64)</a:DataType>
 <a:Length>64</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o404">
 <a:ObjectID>10AE7889-BBF8-4B98-B389-9973971B64F2</a:ObjectID>
@@ -9075,7 +9075,6 @@ monitoring
 <c:ExtendedCollections>
 <o:ExtendedCollection Id="o415">
 <a:ObjectID>D4E84268-B6E2-450D-9E48-18019E5E883D</a:ObjectID>
-<a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
 <a:CreationDate>1483061553</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -9094,7 +9093,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o417">
 <a:ObjectID>BAE41CFB-919A-49B1-9D09-ABFACFACABC3</a:ObjectID>
@@ -9767,7 +9766,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o477">
 <a:ObjectID>D08CF48F-83B2-4F49-8232-3A86F4FB32C2</a:ObjectID>
@@ -10195,7 +10194,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o514">
 <a:ObjectID>1E7CF1BD-5653-432C-9B78-4812E024677E</a:ObjectID>
@@ -10555,7 +10554,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o546">
 <a:ObjectID>775F9E16-520D-412F-9A50-E45C4D99DB52</a:ObjectID>
@@ -11109,7 +11108,6 @@ monitoring
 <c:ExtendedCollections>
 <o:ExtendedCollection Id="o595">
 <a:ObjectID>89687C11-41EE-45AC-B0C0-62BB0BBC0A07</a:ObjectID>
-<a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
 <a:CreationDate>1483080858</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -11128,7 +11126,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o597">
 <a:ObjectID>E6ED7BEE-7F8A-405B-A401-49F16A090C08</a:ObjectID>
@@ -11919,7 +11917,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o669">
 <a:ObjectID>877BD40F-EE31-469B-8AD8-D3CF517B82B3</a:ObjectID>
@@ -12335,7 +12333,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o706">
 <a:ObjectID>5D5323D1-DE87-4F8E-9B69-71E15D75061D</a:ObjectID>
@@ -12729,7 +12727,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o741">
 <a:ObjectID>457A8E1D-11C8-4488-811F-EAE652B3E2A8</a:ObjectID>
@@ -13159,7 +13157,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o779">
 <a:ObjectID>4AD22109-F765-4869-9BEE-B8D131873EB8</a:ObjectID>
@@ -13460,7 +13458,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o805">
 <a:ObjectID>8D7E5DE2-CEAC-4F58-9995-A8E0DB5ED04A</a:ObjectID>
@@ -13786,7 +13784,6 @@ monitoring
 <c:ExtendedCollections>
 <o:ExtendedCollection Id="o833">
 <a:ObjectID>DC4B0750-C4AE-4D33-9C91-70F1A890632E</a:ObjectID>
-<a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
 <a:CreationDate>1483408718</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -13805,7 +13802,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o835">
 <a:ObjectID>3F1E8562-E8C7-4FE7-A276-56D94C589BDB</a:ObjectID>
@@ -14040,7 +14037,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o855">
 <a:ObjectID>4DC4A0AD-5B7D-4628-B277-622E024A6F1C</a:ObjectID>
@@ -14373,7 +14370,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o884">
 <a:ObjectID>16FA63EE-34C4-4905-A4F2-FBAF24ED1511</a:ObjectID>
@@ -14739,7 +14736,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o916">
 <a:ObjectID>9C8E5F68-F1A3-4F8B-B51F-C4E9A44D148D</a:ObjectID>
@@ -15074,7 +15071,7 @@ monitoring
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 </o:Column>
 <o:Column Id="o945">
 <a:ObjectID>3981CCAC-4499-4FA9-8272-9FBA15A37922</a:ObjectID>
@@ -15916,7 +15913,6 @@ monitoring
 <c:ExtendedCollections>
 <o:ExtendedCollection Id="o1021">
 <a:ObjectID>4A064C27-2573-464E-A162-944628812FD1</a:ObjectID>
-<a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
 <a:CreationDate>1483432952</a:CreationDate>
 <a:Creator>b_zhoutlin</a:Creator>
@@ -15936,7 +15932,7 @@ monitoring
 <a:ServerCheckExpression>&quot;ID&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0035302</a:CheckConstraintName>
 </o:Column>
 <o:Column Id="o1023">
@@ -16197,7 +16193,6 @@ monitoring
 <c:ExtendedCollections>
 <o:ExtendedCollection Id="o1042">
 <a:ObjectID>BCBBE1AD-CFF1-484E-80DF-50C25E845F20</a:ObjectID>
-<a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
 <a:CreationDate>1483432749</a:CreationDate>
 <a:Creator>b_zhoutlin</a:Creator>
@@ -16217,7 +16212,7 @@ monitoring
 <a:ServerCheckExpression>&quot;ID&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0035155</a:CheckConstraintName>
 </o:Column>
 <o:Column Id="o1044">
@@ -16783,7 +16778,6 @@ monitoring
 <c:ExtendedCollections>
 <o:ExtendedCollection Id="o1088">
 <a:ObjectID>1EBF29A5-7936-4F65-9F85-22315DF71E54</a:ObjectID>
-<a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
 <a:CreationDate>1483432999</a:CreationDate>
 <a:Creator>b_zhoutlin</a:Creator>
@@ -16803,7 +16797,7 @@ monitoring
 <a:ServerCheckExpression>&quot;ID&quot; IS NOT NULL and %MINMAX% and %LISTVAL% and %CASE% and %RULES%</a:ServerCheckExpression>
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:Mandatory>1</a:Mandatory>
 <a:CheckConstraintName>SYS_C0035299</a:CheckConstraintName>
 </o:Column>
 <o:Column Id="o1090">
@@ -17106,7 +17100,6 @@ monitoring
 <c:ExtendedCollections>
 <o:ExtendedCollection Id="o1114">
 <a:ObjectID>108B94C5-5823-47FD-AE55-E99B2677D418</a:ObjectID>
-<a:Name>MasterTable</a:Name>
 <a:ExtendedBaseCollection.CollectionName>MasterTable</a:ExtendedBaseCollection.CollectionName>
 <a:CreationDate>1482919320</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -17131,7 +17124,6 @@ monitoring
 <a:TargetModelURL>file:///%_DBMS%/ora11g.xdb</a:TargetModelURL>
 <a:TargetModelID>BAE632F3-AC04-4059-9893-259ABA89351C</a:TargetModelID>
 <a:TargetModelClassID>4BA9F647-DAB1-11D1-9944-006097355D9B</a:TargetModelClassID>
-<a:TargetModelLastModificationDate>1355934917</a:TargetModelLastModificationDate>
 <c:SessionShortcuts>
 <o:Shortcut Ref="o3"/>
 <o:Shortcut Ref="o4"/>