diff --git a/@CONTROL/@MACRO/MODEL/DEFAULT.ts.ftl b/@CONTROL/@MACRO/MODEL/DEFAULT.ts.ftl
index d15386f863763e14de4498a82b135c14510f24ab..4ea73156a556068744691a974d35b6bc24b7ec05 100644
--- a/@CONTROL/@MACRO/MODEL/DEFAULT.ts.ftl
+++ b/@CONTROL/@MACRO/MODEL/DEFAULT.ts.ftl
@@ -35,7 +35,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
       {
         name: '${majorAppDataEntity.getCodeName()?lower_case}',
-        prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+        prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
         dataType: 'FONTKEY',
       },
       </#if>
diff --git a/@CONTROL/@MACRO/MODEL/FORM.ts.ftl b/@CONTROL/@MACRO/MODEL/FORM.ts.ftl
index 1093cb21fa9d9bf1e1c99894a8397db2224c8e3d..62ef2d34ad4af61adb40a79b309c29a1904eb033 100644
--- a/@CONTROL/@MACRO/MODEL/FORM.ts.ftl
+++ b/@CONTROL/@MACRO/MODEL/FORM.ts.ftl
@@ -44,7 +44,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
       {
         name: '${majorAppDataEntity.getCodeName()?lower_case}',
-        prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+        prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
         dataType: 'FONTKEY',
       },
       </#if>
diff --git "a/@CONTROL/\345\210\227\350\241\250/MODEL.ts.ftl" "b/@CONTROL/\345\210\227\350\241\250/MODEL.ts.ftl"
index c8684ae5ff7597978dfa4910e24757db893cf213..6be1739ea8f9c56f490a9f28328b486029931bd9 100644
--- "a/@CONTROL/\345\210\227\350\241\250/MODEL.ts.ftl"
+++ "b/@CONTROL/\345\210\227\350\241\250/MODEL.ts.ftl"
@@ -35,7 +35,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
 			{
 				name: '${majorAppDataEntity.getCodeName()?lower_case}',
-				prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+				prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
 			},
       </#if>
     </#list>
diff --git "a/@CONTROL/\345\220\221\345\257\274\351\235\242\346\235\277/MODEL.ts.ftl" "b/@CONTROL/\345\220\221\345\257\274\351\235\242\346\235\277/MODEL.ts.ftl"
index 06fd995fff6faeae7489b82c8cf35c6ed1e2f09e..e1b31b3227c50e137799df5164c427253f602a3d 100644
--- "a/@CONTROL/\345\220\221\345\257\274\351\235\242\346\235\277/MODEL.ts.ftl"
+++ "b/@CONTROL/\345\220\221\345\257\274\351\235\242\346\235\277/MODEL.ts.ftl"
@@ -36,7 +36,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
       {
         name: '${majorAppDataEntity.getCodeName()?lower_case}',
-        prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+        prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
         dataType: 'FONTKEY',
       },
       </#if>
diff --git "a/@CONTROL/\346\225\260\346\215\256\350\247\206\345\233\276/MODEL.ts.ftl" "b/@CONTROL/\346\225\260\346\215\256\350\247\206\345\233\276/MODEL.ts.ftl"
index 9c5a5471562dc0b562c00326be2c877ebf14e771..ebc363ae26501793b24ce3be622ccf1b1e3b805d 100644
--- "a/@CONTROL/\346\225\260\346\215\256\350\247\206\345\233\276/MODEL.ts.ftl"
+++ "b/@CONTROL/\346\225\260\346\215\256\350\247\206\345\233\276/MODEL.ts.ftl"
@@ -31,7 +31,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
 			{
 				name: '${majorAppDataEntity.getCodeName()?lower_case}',
-				prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+				prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
 			},
       </#if>
     </#list>
diff --git "a/@CONTROL/\346\227\245\345\216\206\351\203\250\344\273\266/MODEL.ts.ftl" "b/@CONTROL/\346\227\245\345\216\206\351\203\250\344\273\266/MODEL.ts.ftl"
index 4f686253a79c6eb38a0021944e206f53c5e050bf..469f14a210862c590386c203c3933623a2f587fd 100644
--- "a/@CONTROL/\346\227\245\345\216\206\351\203\250\344\273\266/MODEL.ts.ftl"
+++ "b/@CONTROL/\346\227\245\345\216\206\351\203\250\344\273\266/MODEL.ts.ftl"
@@ -27,7 +27,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
           {
             name: '${majorAppDataEntity.getCodeName()?lower_case}',
-            prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+            prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
           },
       </#if>
     </#list>
diff --git "a/@CONTROL/\346\240\221\350\241\250\346\240\274\357\274\210\345\242\236\345\274\272\357\274\211/MODEL.ts.ftl" "b/@CONTROL/\346\240\221\350\241\250\346\240\274\357\274\210\345\242\236\345\274\272\357\274\211/MODEL.ts.ftl"
index 0de28ef2aba188a66f26fd1cb1f9e57d0dd0f0cf..8990ad53ddfff899b3585a182859b519bb3e5b3c 100644
--- "a/@CONTROL/\346\240\221\350\241\250\346\240\274\357\274\210\345\242\236\345\274\272\357\274\211/MODEL.ts.ftl"
+++ "b/@CONTROL/\346\240\221\350\241\250\346\240\274\357\274\210\345\242\236\345\274\272\357\274\211/MODEL.ts.ftl"
@@ -27,7 +27,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
           {
             name: '${majorAppDataEntity.getCodeName()?lower_case}',
-            prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+            prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
           },
       </#if>
     </#list>
diff --git "a/@CONTROL/\347\212\266\346\200\201\345\220\221\345\257\274\351\235\242\346\235\277/MODEL.ts.ftl" "b/@CONTROL/\347\212\266\346\200\201\345\220\221\345\257\274\351\235\242\346\235\277/MODEL.ts.ftl"
index 06fd995fff6faeae7489b82c8cf35c6ed1e2f09e..e1b31b3227c50e137799df5164c427253f602a3d 100644
--- "a/@CONTROL/\347\212\266\346\200\201\345\220\221\345\257\274\351\235\242\346\235\277/MODEL.ts.ftl"
+++ "b/@CONTROL/\347\212\266\346\200\201\345\220\221\345\257\274\351\235\242\346\235\277/MODEL.ts.ftl"
@@ -36,7 +36,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
       {
         name: '${majorAppDataEntity.getCodeName()?lower_case}',
-        prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+        prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
         dataType: 'FONTKEY',
       },
       </#if>
diff --git "a/@CONTROL/\347\234\213\346\235\277\350\247\206\345\233\276/MODEL.ts.ftl" "b/@CONTROL/\347\234\213\346\235\277\350\247\206\345\233\276/MODEL.ts.ftl"
index 9c5a5471562dc0b562c00326be2c877ebf14e771..ebc363ae26501793b24ce3be622ccf1b1e3b805d 100644
--- "a/@CONTROL/\347\234\213\346\235\277\350\247\206\345\233\276/MODEL.ts.ftl"
+++ "b/@CONTROL/\347\234\213\346\235\277\350\247\206\345\233\276/MODEL.ts.ftl"
@@ -31,7 +31,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
 			{
 				name: '${majorAppDataEntity.getCodeName()?lower_case}',
-				prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+				prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
 			},
       </#if>
     </#list>
diff --git "a/@CONTROL/\350\241\250\346\240\274/MODEL.ts.ftl" "b/@CONTROL/\350\241\250\346\240\274/MODEL.ts.ftl"
index 89ac159bd82c8127c9187bcdfdce7c7f7fc42d1b..26891efcf78baa984b8a944c065750b7724fd4cb 100644
--- "a/@CONTROL/\350\241\250\346\240\274/MODEL.ts.ftl"
+++ "b/@CONTROL/\350\241\250\346\240\274/MODEL.ts.ftl"
@@ -73,7 +73,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
         {
           name: '${majorAppDataEntity.getCodeName()?lower_case}',
-          prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+          prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
           dataType: 'FONTKEY',
         },
       </#if>