Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-12 19befbb8b6ba0f12f7fec0e597edd0f9bce3ec0f

 src/test/java/com/xcong/farmer/cms/ArticleTest.java

@@ -21,12 +21,8 @@
        Long columnId = 83L;
        ArticleEntity article = articleMapper.selectById(88L);

        System.out.println(!article.getColumnId().equals(columnId));
        if (!article.getColumnId().equals(columnId) && article.getBeforeColumnId() == null) {
            article.setBeforeColumnId(article.getColumnId());
        }

        System.out.println(1);
        article.setBeforeColumnId(-1L);
        articleMapper.updateById(article);
    }

}