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

KKSU

2024-01-11 69830f1a3b084ad6800c8013268624a11d7fa5f3

 src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java

@@ -90,6 +90,11 @@
     */
    private Long beforeColumnId;

    /**
     * 草稿状态 1-是 2-否
     */
    private Integer draftState;

    @TableField(exist = false)
    private String columnCode;