From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng

---
 src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java
index 4e3dc91..29e0829 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java
@@ -15,7 +15,7 @@
     private Integer contentType;
 
     @ApiModelProperty(value = "所属栏目ID", example = "2")
-    private String columnId;
+    private String columnIdStr;
 
     @ApiModelProperty(value = "每页条数", example = "10")
     private Integer pageSize;

--
Gitblit v1.9.1