Merge branch 'master' of http://106.14.62.141:8081/sa_aidea/aidea

cms-modules/cms-core-module/src/main/java/com/cftech/cms/cfarticle/dao/CfarticleMapper.xml

@@ -365,7 +365,7 @@ a.content,
 a.desc,
 a.create_time AS createTime,
 a.reading,
-b.remarks,
+b.name,
 a.recommended,
 a.whether_banner AS whetherBanner,
 a.size

cms-modules/cms-core-module/src/main/java/com/cftech/cms/cfarticle/model/CfarticleVO.java

@@ -29,7 +29,7 @@ public class CfarticleVO {
     /* 文章描述 */
     private String desc;
     /* 分类名称 */
-    private String remarks;
+    private String name;
     /* 创建时间 */
 
     private Date createTime;