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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java

@@ -107,6 +107,9 @@ public class JgEquipTransferDto  extends BaseDto {
     @ApiModelProperty(value = "设备注册代码")
     private String equCode;
 
+    @ApiModelProperty(value = "使用登记证编号")
+    private String useOrgCode;
+
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml

@@ -25,6 +25,7 @@
             ri.EQU_PRICE AS equPrice,
             ri.PRODUCT_PHOTO AS productPhoto,
             ri.EQU_CODE,
+            ri.use_org_code AS useOrgCode,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,

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

@@ -695,7 +695,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         dto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
         dto.setStartUserId(reginParams.getUserModel().getUserId());
         dto.setStartUser(reginParams.getUserModel().getRealName());
-        dto.setStartUserCompanyName(reginParams.getCompany().getCompanyCode());
+        dto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
         dto.setStartDate(new Date());
         model.setWorkflowProstanceId(workflowResultDto.getInstanceId());
         model.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());