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

@@ -275,7 +275,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                         // 协管导购
                         for (MemberStoreClerkDataDTO item : list) {
                             String clerkId = item.getClerkIdRel();
-                            if (clerkId.equals(mainClerkId)) {
+                            if (mainStoreId.equals(item.getStoreIdRel())) {
+                                log.info("协管逻辑,主门店直接过滤");
                                 continue;
                             }
                             hm = this.getHmFromClerk(clerkId, wxEnterpriseId);
@@ -374,7 +375,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         }
         // 生成动态活码
         retDTO.setRemarkMap(remarkMap);
-        log.info("活码数据返回={}",JSON.toJSONString(retDTO, true));
+        log.info("活码数据返回={}",JSON.toJSONString(retDTO));
         return ServiceResponse.success(retDTO);
     }