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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java

@@ -356,8 +356,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 bo.setLinkId(linkId);
                 bo.setHmId(hm.getHmId());
                 String dthmKey = this.keyDataService.saveDataForLink(enterpriseId, bo);
+                remarkMap.put("dthmKey", dthmKey) ;
                 if (null != dthmKey) {
-                    remarkMap.put("dthmKey", dthmKey) ;
                     ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, wxEnterpriseDTO.getCorpid(), retDTO);
                     if (!addResp.isSuccess()) {
                         remarkMap.put("sm","创建动态活码失败,取单人活码");