Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-service-system/src/main/java/com/fs/company/cache/impl/CompanyTagCacheServiceImpl.java

@@ -51,7 +51,8 @@ public class CompanyTagCacheServiceImpl implements ICompanyTagCacheService {
     @Override
     public String findUserTagByUserId(Long userId,Long companyUserId) {
         TagConbKey tagConbKey = new TagConbKey();
-
+        tagConbKey.setUserId(userId);
+        tagConbKey.setCompanyUserId(companyUserId);
         return COMPANY_TAG_CACHE.get(tagConbKey,e->
                 companyTagService.findUserTagByUserId(tagConbKey.getUserId(),tagConbKey.getCompanyUserId()));
     }