Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizMissionDocSquareServiceImpl.java

@@ -159,6 +159,7 @@ public class BizMissionDocSquareServiceImpl implements IBizMissionDocSquareServi
         String tenantId = TenantContextHolder.getTenantId();
         BizMissionDocAndSquareCoverDTO bizMissionDocAndSquareCoverDTO = BizMissionDocSquareMapper.INSTANCE.convertCoverDTO(bizMissionDocSquarePO);
         BizMissionDocPO newBizMissionDocPO = BizMissionDocMapper.INSTANCE.convertSquarePO(bizMissionDocAndSquareCoverDTO);
+        newBizMissionDocPO.setTenantId(tenantId);
         newBizMissionDocPO.setSquareDocId(bizMissionDocSquarePO.getId());
         if (tenantId.equals(bizMissionDocSquarePO.getTenantId())) {
             //拉取自己医院推送数据 软删除所以只会更新即可

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionGroupSquareServiceImpl.java

@@ -156,6 +156,7 @@ public class BizQuestionGroupSquareServiceImpl implements IBizQuestionGroupSquar
                 .eq(BizQuestionGroupPO::getMd5, bizQuestionGroupSquarePO.getMd5())
                 .eq(BizQuestionGroupPO::getTenantId, tenantId));
         BizQuestionGroupPO newBizQuestionGroupPO = BizQuestionGroupMapper.INSTANCE.convertQuestionGroupPO(bizQuestionGroupSquarePO);
+        newBizQuestionGroupPO.setTenantId(tenantId);
         newBizQuestionGroupPO.setSquareId(bizQuestionGroupSquarePO.getId());
         if(ObjectUtil.isNotNull(bizQuestionGroupPO)){
             //相同内容并且是自己医院问卷对问卷信息做更新