Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -526,6 +526,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             String equList = String.valueOf(detailFieldCamelCaseByRecord.getOrDefault("equList", ""));
             BeanUtil.copyProperties(installationInfo, detailFieldCamelCaseByRecord);
             detailFieldCamelCaseByRecord.put("equList", equList);
+            detailFieldCamelCaseByRecord.put("EQU_LIST_CODE", equList);
             return new HashMap<String, Object>() {{
                 this.put(PAGE_KEY, detailFieldCamelCaseByRecord);
             }};

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -399,6 +399,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             unitCode = jyjcOpeningApplicationModel.getUnitCode();
         } else {
             jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
+            jyjcOpeningApplicationModel.setResultType("input");
             unitCode = reginParams.getCompany().getCompanyCode();
         }
         QueryWrapper enterpriseInfoQueryWrapper = new QueryWrapper<>();