Merge branch 'server-165' of uskycloud/usky-modules into master

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

@@ -3,6 +3,7 @@ package com.usky.website.domain;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -86,6 +87,7 @@ public class SiteArticle implements Serializable {
     /**
      * 内容排序
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer sortindex;
 
     /**

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

@@ -89,6 +89,11 @@ public class SiteCategory implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 类型;1:图片 2:视频
+     */
+    private Integer modelType;
+
     /**
      * 子级
      */

service-website/service-website-biz/src/main/resources/mapper/website/SiteCategoryMapper.xml

@@ -17,6 +17,7 @@
         <result column="modifydate" property="modifydate" />
         <result column="sortindex" property="sortindex" />
         <result column="status" property="status" />
+        <result column="model_type" property="modelType" />
     </resultMap>
 
 </mapper>