'解决冲突'

service-fire/service-fire-biz/pom.xml

@@ -88,7 +88,6 @@
             <artifactId>itextpdf</artifactId>
             <version>5.4.3</version>
         </dependency>
-
     </dependencies>
 
     <build>

service-website/service-website-biz/src/main/java/com/usky/website/domain/SiteArticle.java

@@ -84,7 +84,7 @@ public class SiteArticle implements Serializable {
     private LocalDateTime modifydate;
 
     /**
-     * 栏目排序
+     * 内容排序
      */
     private Integer sortindex;