Merge remote-tracking branch 'origin/cms' into anentang

KKSU

2024-01-11 69830f1a3b084ad6800c8013268624a11d7fa5f3

 src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java

@@ -55,6 +55,8 @@
            article.setColumnIds(colIds);
        }
        article.setCompanyId(companyId);
        article.setDelStatus(ArticleEntity.DELETE_STATUS_NO);
        article.setDraftState(2);

        if (StrUtil.isNotBlank(param.getType())) {
            if ("hot".equals(param.getType())) {