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/DataHandlerServiceImpl.java

@@ -1426,6 +1426,7 @@ public class DataHandlerServiceImpl {
             EsBaseEnterpriseInfo esBaseEnterpriseInfo = new EsBaseEnterpriseInfo();
             BeanUtil.copyProperties(enterpriseInfo, esBaseEnterpriseInfo);
             esBaseEnterpriseInfo.setSequenceNbr(enterpriseInfo.getSequenceNbr() + "");
+            esBaseEnterpriseInfo.setContactUser(enterpriseInfo.getUseContact());
             esBaseEnterpriseInfo.setEquipCategory(StatisticsDataUpdateService.castStrList2String(enterpriseInfo.getEquipCategory()));
             List<TzBaseUnitLicence> unitLicences = licenceMapper.selectList(new LambdaQueryWrapper<TzBaseUnitLicence>()
                     .eq(TzBaseUnitLicence::getUnitCode, enterpriseInfo.getUseUnitCode())

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java

@@ -65,6 +65,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
                 EsBaseEnterpriseInfo esBaseEnterpriseInfo = new EsBaseEnterpriseInfo();
                 BeanUtil.copyProperties(enterpriseInfo, esBaseEnterpriseInfo);
                 esBaseEnterpriseInfo.setSequenceNbr(enterpriseInfo.getSequenceNbr() + "");
+                esBaseEnterpriseInfo.setContactUser(enterpriseInfo.getUseContact());
                 esBaseEnterpriseInfo.setEquipCategory(RefreshDataUtils.castStrList2String(enterpriseInfo.getEquipCategory()));
                 List<TzBaseUnitLicence> unitLicences = licenceMapper.selectList(new LambdaQueryWrapper<TzBaseUnitLicence>().eq(TzBaseUnitLicence::getUnitCode, enterpriseInfo.getUseUnitCode()).eq(TzBaseUnitLicence::getIsDelete, false));
                 List<EsBaseEnterpriseInfo.License> licenses = unitLicences.stream().map(lis -> {