Merge remote-tracking branch 'origin/master'

# Conflicts:
#	kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java

kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/SynTask.java

@@ -148,7 +148,7 @@ public class SynTask {
             }
             // 删除缓存
             DscSxAdsShareItemQltQlsxCommonIDVKq matter = getSynUrl(key);
-            String url = KQ_ZZS_BASE_URL.replace("localInnerCode=", "localInnerCode=" + matter.getQlInnerCodeItem());
+            String url = KQ_ZZS_BASE_URL.replace("localInnerCode=", "localInnerCode=" + matter.getQlInnerCode());
             MatterKey matterKey = MatterKey.of(matter.getQlName(),url);
             try {
                 mattersDupCache.invalidate(matterKey);
@@ -175,14 +175,14 @@ public class SynTask {
                         .select(DscSxAdsShareItemQltQlsxCommonIDVKq::getRowguid,
                                 DscSxAdsShareItemQltQlsxCommonIDVKq::getQlName,
                                 DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState,
-                                DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem,
+                                DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCode,
                                 DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl)
                         .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlName, key)
                         .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1")
                         .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl)
                         // 确保getQlInnerCodeItem字段不为null且不为""
-                        .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem)
-                        .ne(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem, "")
+                        .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCode)
+                        .ne(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCode, "")
                         .orderByDesc(DscSxAdsShareItemQltQlsxCommonIDVKq::getUpdateDate)
                         .last(BizConst.LIMIT_1));
         return matter;
@@ -190,7 +190,7 @@ public class SynTask {
 
     public String synSingle(String key){
         DscSxAdsShareItemQltQlsxCommonIDVKq matter = getSynUrl(key);
-        String url = KQ_ZZS_BASE_URL.replace("localInnerCode=", "localInnerCode=" + matter.getQlInnerCodeItem());
+        String url = KQ_ZZS_BASE_URL.replace("localInnerCode=", "localInnerCode=" + matter.getQlInnerCode());
         List<NdKqZzsfwMenu> menus = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class)
                 .eq(NdKqZzsfwMenu::getItemName, key));
         menus.forEach(menu->{